1 files changed, 46 insertions, 38 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index e7f582b42..cfaf33b85 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -1,48 +1,56 @@
 #!/bin/bash
 
 set -e
+
 source $(dirname $0)/lib.sh
 
 req_env_var GOSRC SCRIPT_BASE OS_RELEASE_ID OS_RELEASE_VER CONTAINER_RUNTIME
 
-cd "$GOSRC"
-
-if [[ "$SPECIALMODE" == "in_podman" ]]
-then
-    ${CONTAINER_RUNTIME} run --rm --privileged --net=host \
-        -v $GOSRC:$GOSRC:Z \
-        --workdir $GOSRC \
-        -e "CGROUP_MANAGER=cgroupfs" \
-        -e "STORAGE_OPTIONS=--storage-driver=vfs" \
-        -e "CRIO_ROOT=$GOSRC" \
-        -e "PODMAN_BINARY=/usr/bin/podman" \
-        -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 -n
+# Our name must be of the form xxxx_test or xxxx_test.sh, where xxxx is
+# the test suite to run; currently (2019-05) the only option is 'integration'
+# but pr2947 intends to add 'system'.
+TESTSUITE=$(expr $(basename $0) : '\(.*\)_test')
+if [[ -z $TESTSUITE ]]; then
+    die 1 "Script name is not of the form xxxx_test.sh"
+fi
 
-    exit $?
-elif [[ "$SPECIALMODE" == "rootless" ]]
-then
-    req_env_var ROOTLESS_USER
+cd "$GOSRC"
 
-    if [[ "$USER" == "$ROOTLESS_USER" ]]
-    then
-        $GOSRC/$SCRIPT_BASE/rootless_test.sh
-    else
+case "$SPECIALMODE" in
+    in_podman)
+        ${CONTAINER_RUNTIME} run --rm --privileged --net=host \
+            -v $GOSRC:$GOSRC:Z \
+            --workdir $GOSRC \
+            -e "CGROUP_MANAGER=cgroupfs" \
+            -e "STORAGE_OPTIONS=--storage-driver=vfs" \
+            -e "CRIO_ROOT=$GOSRC" \
+            -e "PODMAN_BINARY=/usr/bin/podman" \
+            -e "CONMON_BINARY=/usr/libexec/podman/conmon" \
+            -e "DIST=$OS_RELEASE_ID" \
+            -e "CONTAINER_RUNTIME=$CONTAINER_RUNTIME" \
+            $IN_PODMAN_IMAGE bash $GOSRC/$SCRIPT_BASE/container_test.sh -b -i -t
+        ;;
+    rootless)
+        req_env_var ROOTLESS_USER
         ssh $ROOTLESS_USER@localhost \
-                -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no \
-                $GOSRC/$SCRIPT_BASE/rootless_test.sh
-    fi
-else
-    make
-    make install PREFIX=/usr ETCDIR=/etc
-    make test-binaries
-    if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
-    then
-        make remoteintegration
-    else
-        make localintegration
-    fi
-    exit $?
-fi
+                -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
+                -o CheckHostIP=no $GOSRC/$SCRIPT_BASE/rootless_test.sh ${TESTSUITE}
+        ;;
+    none)
+        make
+        make install PREFIX=/usr ETCDIR=/etc
+        make test-binaries
+        if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
+        then
+            make remote${TESTSUITE}
+        else
+            make local${TESTSUITE}
+        fi
+        ;;
+    windows) ;&  # for podman-remote building only
+    darwin)
+        warn '' "No $SPECIALMODE remote client integration tests configured"
+        ;;
+    *)
+        die 110 "Unsupported \$SPECIAL_MODE: $SPECIALMODE"
+esac