4 files changed, 11 insertions, 7 deletions
diff --git a/tools/ci/scripts/dockerretry.sh b/tools/ci/scripts/dockerretry.sh
index 121878cbb..58dcdb5b1 100755
--- a/tools/ci/scripts/dockerretry.sh
+++ b/tools/ci/scripts/dockerretry.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 # skip if we not in docker
-if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then
+if [[ ${CI_RUNNER_ID} != "" ]];
+then
     echo "Running from shell. Skipping $*"
     exit 0
 fi
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index cff5a62e1..c715f3032 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -13,7 +13,7 @@ function do_init {
 }
 
 function update_repos {
-    if [ "$CI_RUNNER_ID" != "" ];
+    if [[ ${CI_RUNNER_ID} != "" ]];
     then
         echo "Running from shell. Skipping update repos"
         return
@@ -29,7 +29,7 @@ function update_repos {
 }
 
 function aptget_update {
-    if [ "$CI_RUNNER_ID" != "" ];
+    if [[ ${CI_RUNNER_ID} != "" ]];
     then
         echo "Running from shell. Skipping apt-get update"
         return
@@ -59,7 +59,7 @@ function aptget_update {
 }
 
 function aptget_install {
-    if [ "$CI_RUNNER_ID" != "" ];
+    if [[ ${CI_RUNNER_ID} != "" ]];
     then
         echo "Running from shell. Skipping apt-get"
         return
diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh
index 18bcd7512..7d9a18335 100755
--- a/tools/ci/scripts/runtests.sh
+++ b/tools/ci/scripts/runtests.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
-if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then
-    if [[ ${CIRRUS_CI} != "true" ]]; then
+if [[ ${CI_RUNNER_ID} != "" ]]; 
+then
+    if [[ ${CIRRUS_CI} != "true" ]];
+    then
         echo "Running from shell. Skipping run tests $*"
         exit 0
     fi
diff --git a/tools/ci/scripts/updaterepos.sh b/tools/ci/scripts/updaterepos.sh
index f0698fc19..75d2e2eff 100755
--- a/tools/ci/scripts/updaterepos.sh
+++ b/tools/ci/scripts/updaterepos.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then
+if [[ ${CI_RUNNER_ID} != "" ]];
+then
     echo "Running from shell. Skipping update repos"
     exit 0
 fi