Fix integration tests setup.

* remove the "-s" option from the call to "which" (it seems to be a MacOSX only option) * use panubo/sshd instead of macropin/sshd as a base docker image (macropin has been replaced by panubo) Change-Id: Iabd04f6292964e8ad50bf6a3b3aabc00669a9903
wikimedia · Aug 2, 2018 · 9dbc1c7 · 9dbc1c7
1 parent b8431a7
commit 9dbc1c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cumin/tests/integration/docker.sh b/cumin/tests/integration/docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-if ! which -s docker; then
+if ! which docker &> /dev/null; then
     echo "docker executable not found. Aborting!"
     exit 1
 fi

diff --git a/cumin/tests/integration/transports/clustershell.sh b/cumin/tests/integration/transports/clustershell.sh
@@ -20,7 +20,7 @@ EOF
     for index in {1..5}; do
         HOST_NAME="${CUMIN_IDENTIFIER}-${index}"
         # TODO: use a custom-generated image
-        docker run -d -p "222${index}:22" -v "/${CUMIN_TMPDIR}/id_rsa.pub:/root/.ssh/authorized_keys" --name "${HOST_NAME}" "macropin/sshd" > /dev/null
+        docker run -d -p "222${index}:22" -v "/${CUMIN_TMPDIR}/id_rsa.pub:/root/.ssh/authorized_keys" --name "${HOST_NAME}" "panubo/sshd" > /dev/null
         DOCKER_INSTANCES="${DOCKER_INSTANCES} ${HOST_NAME}"
         SSH_ALIASES="${SSH_ALIASES}
 Host ${HOST_NAME}