diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-18 14:17:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 14:17:41 -0700 |
| commit | e4947e5fd699f584cb815a4f4fd92f22b62f2c8a (patch) | |
| tree | 525468fc942fcf473ad1df3722bbf05ea03f3c7b /contrib | |
| parent | 4d45f5180f778bf3a298bf061ca2c0dba0d4bfad (diff) | |
| parent | 55e630e7876557ebd2a44e81fa357aab9efbb793 (diff) | |
| download | podman-e4947e5fd699f584cb815a4f4fd92f22b62f2c8a.tar.gz podman-e4947e5fd699f584cb815a4f4fd92f22b62f2c8a.tar.bz2 podman-e4947e5fd699f584cb815a4f4fd92f22b62f2c8a.zip | |
Merge pull request #2948 from baude/remotepause
podman-remote pause|unpause
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/container_test.sh | 8 | ||||
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/contrib/cirrus/container_test.sh b/contrib/cirrus/container_test.sh index e6c1a3a47..1fd9551db 100644 --- a/contrib/cirrus/container_test.sh +++ b/contrib/cirrus/container_test.sh @@ -32,6 +32,7 @@ integrationtest=0 unittest=0 validate=0 options=0 +noremote=0 install_tools_made=0 while getopts "biptuv" opt; do @@ -45,6 +46,9 @@ while getopts "biptuv" opt; do t) integrationtest=1 options=1 ;; + n) noremote=1 + options=1 + ;; u) unittest=1 options=1 ;; @@ -127,5 +131,7 @@ if [ $integrationtest -eq 1 ]; then make TAGS="${TAGS}" test-binaries make varlink_generate make ginkgo $INTEGRATION_TEST_ENVS - make ginkgo-remote $INTEGRATION_TEST_ENVS + if [ $noremote -eq 0 ]; then + make ginkgo-remote $INTEGRATION_TEST_ENVS + fi fi diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index 8a2507f38..95387ff49 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -34,7 +34,7 @@ then -e "CONMON_BINARY=/usr/libexec/podman/conmon" \ -e "DIST=$OS_RELEASE_ID" \ -e "CONTAINER_RUNTIME=$CONTAINER_RUNTIME" \ - ${OS_RELEASE_ID}podmanbuild bash $GOSRC/$SCRIPT_BASE/container_test.sh -b -i -t + ${OS_RELEASE_ID}podmanbuild bash $GOSRC/$SCRIPT_BASE/container_test.sh -b -i -t -n exit $? elif [[ "$SPECIALMODE" == "rootless" ]] |