diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-15 22:20:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 22:20:04 +0200 |
| commit | 7ede1594652003e1ec545dc5c98c44142dcdd7c3 (patch) | |
| tree | c336eb07ee946b91c84417dfc7ae04791f149ec8 /contrib/cirrus | |
| parent | 3057572fc1d7955fd0425c1a478c58d5e2488f53 (diff) | |
| parent | a86aa4b1e92a7d53c932dd0b06c9f51bfce47e18 (diff) | |
| download | podman-7ede1594652003e1ec545dc5c98c44142dcdd7c3.tar.gz podman-7ede1594652003e1ec545dc5c98c44142dcdd7c3.tar.bz2 podman-7ede1594652003e1ec545dc5c98c44142dcdd7c3.zip | |
Merge pull request #3089 from baude/splittest
split remote tests from distro tests
Diffstat (limited to 'contrib/cirrus')
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 8 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 1 |
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 98276b70c..4dbd56ed9 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"' \ |