From c110f17df400383d6aa94532cbd69d213ef48d6d Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Mon, 20 Jan 2020 19:34:01 -0700 Subject: [PATCH] Disable db tests on publish --- Dockerfile.test.dapper | 2 +- scripts/test | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper index 367991d5a9..5267da3a3a 100644 --- a/Dockerfile.test.dapper +++ b/Dockerfile.test.dapper @@ -19,7 +19,7 @@ RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \ ENV TEST_CLEANUP true ENV DAPPER_RUN_ARGS --privileged --network host -ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME GCLOUD_AUTH +ENV DAPPER_ENV REPO TAG DRONE_TAG DRONE_SYSTEM_HOST IMAGE_NAME GCLOUD_AUTH ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/ ENV DAPPER_OUTPUT ./dist ENV DAPPER_DOCKER_SOCKET true diff --git a/scripts/test b/scripts/test index 64fef23b81..39c9032803 100755 --- a/scripts/test +++ b/scripts/test @@ -17,9 +17,14 @@ E2E_OUTPUT=$artifacts test-run-sonobuoy # --- +if [[ "$DRONE_SYSTEM_HOST" =~ 'publish' ]]; then + printf "\033[33mSkipping remaining tests on publish.\033[m\n" + exit 0 +fi + if [ "$ARCH" != 'amd64' ]; then - printf "\033[33mSkipping remaining tests, images not available for $ARCH.\033[m\n" - exit 0 + printf "\033[33mSkipping remaining tests, images not available for $ARCH.\033[m\n" + exit 0 fi # ---