diff options
author | baude <bbaude@redhat.com> | 2017-11-03 14:37:22 -0500 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-11-17 02:07:18 +0000 |
commit | d2eda1a8648b7e6053627e48bf500f9671f0a6c2 (patch) | |
tree | 0b86ea7165ab02003b9e6fc480432774a72724a6 /test/kpod_import.bats | |
parent | bf8b9a37df2aeead009996875f58c59625110472 (diff) | |
download | podman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.tar.gz podman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.tar.bz2 podman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.zip |
Enhancements to papr tests
The PR contains several enhancements to our CI testing.
- enable lint testing on Fedora
- add Centos Atomic as test platform
- integration tests on run on the OS natively (uncontainerized)
- builds are done in containers
- inclusion of Vagrant file for local testing
Signed-off-by: baude <bbaude@redhat.com>
Closes: #18
Approved by: mheon
Diffstat (limited to 'test/kpod_import.bats')
-rw-r--r-- | test/kpod_import.bats | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/test/kpod_import.bats b/test/kpod_import.bats index 03a89f2e8..ef2ef342d 100644 --- a/test/kpod_import.bats +++ b/test/kpod_import.bats @@ -9,30 +9,30 @@ function teardown() { } @test "kpod import with source and reference" { - skip "Test needs to be converted to kpod run" + skip "Test needs to be converted to kpod run bash -c" start_crio - run crioctl pod run --config "$TESTDATA"/sandbox_config.json + run bash -c crioctl pod run bash -c --config "$TESTDATA"/sandbox_config.json echo "$output" [ "$status" -eq 0 ] pod_id="$output" - run crioctl image pull "$IMAGE" + run bash -c crioctl image pull "$IMAGE" echo "$output" [ "$status" -eq 0 ] - run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" + run bash -c crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" echo "$output" [ "$status" -eq 0 ] ctr_id="$output" - run ${KPOD_BINARY} ${KPOD_OPTIONS} export -o container.tar "$ctr_id" + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} export -o container.tar "$ctr_id" echo "$output" [ "$status" -eq 0 ] - run ${KPOD_BINARY} ${KPOD_OPTIONS} import container.tar imported-image + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} import container.tar imported-image echo "$output" [ "$status" -eq 0 ] - run ${KPOD_BINARY} ${KPOD_OPTIONS} images + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} images echo "$output" [ "$status" -eq 0 ] images="$output" - run grep "imported-image" <<< "$images" + run bash -c grep "imported-image" <<< "$images" echo "$output" [ "$status" -eq 0 ] cleanup_ctrs @@ -42,30 +42,30 @@ function teardown() { } @test "kpod import without reference" { - skip "Test needs to be converted to kpod run" + skip "Test needs to be converted to kpod run bash -c" start_crio - run crioctl pod run --config "$TESTDATA"/sandbox_config.json + run bash -c crioctl pod run bash -c --config "$TESTDATA"/sandbox_config.json echo "$output" [ "$status" -eq 0 ] pod_id="$output" - run crioctl image pull "$IMAGE" + run bash -c crioctl image pull "$IMAGE" echo "$output" [ "$status" -eq 0 ] - run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" + run bash -c crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" echo "$output" [ "$status" -eq 0 ] ctr_id="$output" - run ${KPOD_BINARY} ${KPOD_OPTIONS} export -o container.tar "$ctr_id" + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} export -o container.tar "$ctr_id" echo "$output" [ "$status" -eq 0 ] - run ${KPOD_BINARY} ${KPOD_OPTIONS} import container.tar + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} import container.tar echo "$output" [ "$status" -eq 0 ] - run ${KPOD_BINARY} ${KPOD_OPTIONS} images + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} images echo "$output" [ "$status" -eq 0 ] images="$output" - run grep "<none>" <<< "$images" + run bash -c grep "<none>" <<< "$images" echo "$output" [ "$status" -eq 0 ] cleanup_ctrs @@ -75,30 +75,30 @@ function teardown() { } @test "kpod import with message flag" { - skip "Test needs to be converted to kpod run" + skip "Test needs to be converted to kpod run bash -c" start_crio - run crioctl pod run --config "$TESTDATA"/sandbox_config.json + run bash -c crioctl pod run bash -c --config "$TESTDATA"/sandbox_config.json echo "$output" [ "$status" -eq 0 ] pod_id="$output" - run crioctl image pull "$IMAGE" + run bash -c crioctl image pull "$IMAGE" echo "$output" [ "$status" -eq 0 ] - run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" + run bash -c crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" echo "$output" [ "$status" -eq 0 ] ctr_id="$output" - run ${KPOD_BINARY} ${KPOD_OPTIONS} export -o container.tar "$ctr_id" + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} export -o container.tar "$ctr_id" echo "$output" [ "$status" -eq 0 ] - run ${KPOD_BINARY} ${KPOD_OPTIONS} import --message "importing container test message" container.tar imported-image + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} import --message "importing container test message" container.tar imported-image echo "$output" [ "$status" -eq 0 ] - run ${KPOD_BINARY} ${KPOD_OPTIONS} history imported-image + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} history imported-image echo "$output" [ "$status" -eq 0 ] history="$output" - run grep "importing container test message" <<< "$history" + run bash -c grep "importing container test message" <<< "$history" echo "$output" [ "$status" -eq 0 ] cleanup_ctrs @@ -108,30 +108,30 @@ function teardown() { } @test "kpod import with change flag" { - skip "Test needs to be converted to kpod run" + skip "Test needs to be converted to kpod run bash -c" start_crio - run crioctl pod run --config "$TESTDATA"/sandbox_config.json + run bash -c crioctl pod run bash -c --config "$TESTDATA"/sandbox_config.json echo "$output" [ "$status" -eq 0 ] pod_id="$output" - run crioctl image pull "$IMAGE" + run bash -c crioctl image pull "$IMAGE" echo "$output" [ "$status" -eq 0 ] - run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" + run bash -c crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" echo "$output" [ "$status" -eq 0 ] ctr_id="$output" - run ${KPOD_BINARY} ${KPOD_OPTIONS} export -o container.tar "$ctr_id" + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} export -o container.tar "$ctr_id" echo "$output" [ "$status" -eq 0 ] - run ${KPOD_BINARY} ${KPOD_OPTIONS} import --change "CMD=/bin/bash" container.tar imported-image + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} import --change "CMD=/bin/bash" container.tar imported-image echo "$output" [ "$status" -eq 0 ] - run ${KPOD_BINARY} ${KPOD_OPTIONS} inspect imported-image + run bash -c ${KPOD_BINARY} ${KPOD_OPTIONS} inspect imported-image echo "$output" [ "$status" -eq 0 ] inspect="$output" - run grep "/bin/bash" <<< "$inspect" + run bash -c grep "/bin/bash" <<< "$inspect" echo "$output" [ "$status" -eq 0 ] cleanup_ctrs |