summaryrefslogtreecommitdiff
path: root/contrib/cirrus/container_test.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-18 14:17:41 -0700
committerGitHub <noreply@github.com>2019-04-18 14:17:41 -0700
commite4947e5fd699f584cb815a4f4fd92f22b62f2c8a (patch)
tree525468fc942fcf473ad1df3722bbf05ea03f3c7b /contrib/cirrus/container_test.sh
parent4d45f5180f778bf3a298bf061ca2c0dba0d4bfad (diff)
parent55e630e7876557ebd2a44e81fa357aab9efbb793 (diff)
downloadpodman-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/cirrus/container_test.sh')
-rw-r--r--contrib/cirrus/container_test.sh8
1 files changed, 7 insertions, 1 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