From 55e630e7876557ebd2a44e81fa357aab9efbb793 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 15 Apr 2019 09:03:18 -0500 Subject: podman-remote pause|unpause Add the ability to pause and unpause containers with the remote client. Also turned on the pause tests! Signed-off-by: baude --- contrib/cirrus/container_test.sh | 8 +++++++- contrib/cirrus/integration_test.sh | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'contrib') 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" ]] -- cgit v1.2.3-54-g00ecf