summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-05-08 15:21:33 -0500
committerbaude <bbaude@redhat.com>2019-05-13 12:17:55 -0500
commita86aa4b1e92a7d53c932dd0b06c9f51bfce47e18 (patch)
tree2cf8fd1726f1053691d5dcd646f0028fa43b41fd /contrib/cirrus
parentd2571c7fd49d22e822a6f3b3796488218c9f9e46 (diff)
downloadpodman-a86aa4b1e92a7d53c932dd0b06c9f51bfce47e18.tar.gz
podman-a86aa4b1e92a7d53c932dd0b06c9f51bfce47e18.tar.bz2
podman-a86aa4b1e92a7d53c932dd0b06c9f51bfce47e18.zip
split remote tests from distro tests
We want the remote tests for our distributions to be tested in a different VM than the local tests. This allows for faster CI runs and easier debug as well as seperation of flakes. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/integration_test.sh8
-rwxr-xr-xcontrib/cirrus/setup_environment.sh1
2 files changed, 8 insertions, 1 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index 5b73f0c6c..c7d381318 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -36,6 +36,7 @@ else
make
make install PREFIX=/usr ETCDIR=/etc
make test-binaries
+ make install.tools
clean_env
case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
@@ -49,6 +50,11 @@ else
;;
*) bad_os_id_ver ;;
esac
- make localintegration
+ if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
+ then
+ make remoteintegration
+ else
+ make localintegration
+ fi
exit $?
fi
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 2f9b1d796..30bca9af2 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -36,6 +36,7 @@ then
"export OS_RELEASE_ID=\"$(os_release_id)\"" \
"export OS_RELEASE_VER=\"$(os_release_ver)\"" \
"export OS_REL_VER=\"$(os_release_id)-$(os_release_ver)\"" \
+ "export TEST_REMOTE_CLIENT=\"$TEST_REMOTE_CLIENT\"" \
"export BUILT_IMAGE_SUFFIX=\"-$CIRRUS_REPO_NAME-${CIRRUS_CHANGE_IN_REPO:0:8}\"" \
"export GOPATH=\"/var/tmp/go\"" \
'export PATH="$HOME/bin:$GOPATH/bin:/usr/local/bin:$PATH"' \