summaryrefslogtreecommitdiff
path: root/contrib/cirrus/integration_test.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-05-07 13:31:04 -0400
committerChris Evich <cevich@redhat.com>2019-06-14 13:41:58 -0400
commit11484580d35c7310242303fa0728e3681462f37f (patch)
tree395230c6548e18f63779e0f98631efe3ac3bed30 /contrib/cirrus/integration_test.sh
parent60a857db6293fcf012e218f133c369ec5a8065ba (diff)
downloadpodman-11484580d35c7310242303fa0728e3681462f37f.tar.gz
podman-11484580d35c7310242303fa0728e3681462f37f.tar.bz2
podman-11484580d35c7310242303fa0728e3681462f37f.zip
Cirrus: Add support for testing F30
Remove disused `build_cache_images` task, and update relevant dockerfiles for F30. Fix problem of cloud-init failing to expand root-device on boot (/var/lib/cloud/instance left in improper state). Fix problem of cloud-init racing with google-network-daemon.service on boot (looking for cloudconfig metadata too early). Causing root-device to _sometimes_ fail to expand. Fix problem of hack/get_ci_vm.sh argument passing. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/integration_test.sh')
-rwxr-xr-xcontrib/cirrus/integration_test.sh3
1 files changed, 0 insertions, 3 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index f9ba010cd..b163834d5 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -28,8 +28,6 @@ then
-e "DIST=$OS_RELEASE_ID" \
-e "CONTAINER_RUNTIME=$CONTAINER_RUNTIME" \
$IN_PODMAN_IMAGE bash $GOSRC/$SCRIPT_BASE/container_test.sh -b -i -t
-
- exit $?
elif [[ "$SPECIALMODE" == "rootless" ]]
then
req_env_var ROOTLESS_USER
@@ -52,5 +50,4 @@ else
else
make local${TESTSUITE}
fi
- exit $?
fi