Merge pull request #3236 from baude/testsplitrootless

split rootless local and remote testing

1 files changed, 10 insertions, 7 deletions

diff --git a/contrib/cirrus/container_test.sh b/contrib/cirrus/container_test.sh
index 6bd925f17..a0542f4a0 100644
--- a/contrib/cirrus/container_test.sh
+++ b/contrib/cirrus/container_test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -xeuo pipefail
+set -xeo pipefail
 
 export GOPATH=/var/tmp/go
 export PATH=$HOME/gopath/bin:$PATH:$GOPATH/bin
@@ -32,10 +32,10 @@ integrationtest=0
 unittest=0
 validate=0
 options=0
-noremote=0
+remote=0
 install_tools_made=0
 
-while getopts "bitnuv" opt; do
+while getopts "bituv" opt; do
     case "$opt" in
     b) build=1
        options=1
@@ -46,9 +46,6 @@ while getopts "bitnuv" opt; do
     t) integrationtest=1
        options=1
        ;;
-    n) noremote=1
-       options=1
-       ;;
     u) unittest=1
        options=1
        ;;
@@ -58,6 +55,12 @@ while getopts "bitnuv" opt; do
     esac
 done
 
+# The TEST_REMOTE_CLIENT environment variable decides whether
+# to test varlinke
+if [[ "$TEST_REMOTE_CLIENT" == "true" ]]; then
+    remote=1
+fi
+
 # If no options are passed, do everything
 if [ $options -eq 0 ]; then
     build=1
@@ -131,7 +134,7 @@ if [ $integrationtest -eq 1 ]; then
     make TAGS="${TAGS}" test-binaries
     make varlink_generate
     make ginkgo $INTEGRATION_TEST_ENVS
-    if [ $noremote -eq 0 ]; then
+    if [ $remote -eq 1 ]; then
         make ginkgo-remote $INTEGRATION_TEST_ENVS
     fi
 fi