From 3f849786de08ae96f8dc70d5771cc6f408022686 Mon Sep 17 00:00:00 2001
From: Erik Wilson <Erik.E.Wilson@gmail.com>
Date: Thu, 2 May 2019 12:04:45 -0700
Subject: [PATCH] Fix e2e testing on publish

---
 .drone.yml                 |  2 +-
 Dockerfile.sonobuoy.dapper |  3 ++-
 scripts/sonobuoy           | 10 +++++-----
 scripts/sonobuoy-e2e-tests | 13 +++++++------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c73f24cec2..8fd13b5e27 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,7 +18,7 @@ steps:
 - name: sonobuoy-e2e-tests
   image: rancher/dapper:v0.4.1
   commands:
-  - dapper -f Dockerfile.sonobuoy.dapper sonobuoy-e2e-tests
+  - dapper -f Dockerfile.sonobuoy.dapper
   volumes:
   - name: docker
     path: /var/run/docker.sock
diff --git a/Dockerfile.sonobuoy.dapper b/Dockerfile.sonobuoy.dapper
index 058f3753a6..73ab8ae289 100644
--- a/Dockerfile.sonobuoy.dapper
+++ b/Dockerfile.sonobuoy.dapper
@@ -15,6 +15,7 @@ RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
     chmod a+x /usr/local/bin/kubectl
 
 ENV DAPPER_RUN_ARGS --privileged --network host
+ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME
 ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
 ENV DAPPER_OUTPUT ./dist
 ENV DAPPER_DOCKER_SOCKET true
@@ -22,4 +23,4 @@ ENV HOME ${DAPPER_SOURCE}
 WORKDIR ${DAPPER_SOURCE}
 
 ENTRYPOINT ["./scripts/entry.sh"]
-CMD ["ci"]
+CMD ["sonobuoy-e2e-tests"]
diff --git a/scripts/sonobuoy b/scripts/sonobuoy
index 1783c36142..a2cefc013f 100755
--- a/scripts/sonobuoy
+++ b/scripts/sonobuoy
@@ -25,7 +25,7 @@ get-port() {
 }
 export -f get-port
 
-K3S_PORT=$(timeout 5s bash -c get-port)
+K3S_PORT=$(timeout --foreground 5s bash -c get-port)
 OUTPUT=$(pwd)/sonobuoy-output/${K3S_PORT}
 mkdir -p ${OUTPUT}
 
@@ -84,7 +84,7 @@ wait-for-kubeconfig() {
 }
 export -f wait-for-kubeconfig
 
-timeout 1m bash -c wait-for-kubeconfig
+timeout --foreground 1m bash -c wait-for-kubeconfig
 
 # ---
 
@@ -104,7 +104,7 @@ wait-for-nodes() {
 }
 export -f wait-for-nodes
 
-timeout 1m bash -c wait-for-nodes
+timeout --foreground 1m bash -c wait-for-nodes
 
 # ---
 
@@ -125,13 +125,13 @@ wait-for-services() {
 }
 export -f wait-for-services
 
-timeout 1m bash -c wait-for-services
+timeout --foreground 1m bash -c wait-for-services
 
 # ---
 
 echo "Starting sonobuoy tests"
 
-timeout 30m sonobuoy run \
+timeout --foreground 30m sonobuoy run \
     --config scripts/sonobuoy-config.json \
     --wait \
     ${@}
diff --git a/scripts/sonobuoy-e2e-tests b/scripts/sonobuoy-e2e-tests
index e5603948bb..804623d4a4 100755
--- a/scripts/sonobuoy-e2e-tests
+++ b/scripts/sonobuoy-e2e-tests
@@ -1,14 +1,15 @@
 #!/bin/bash
 set -e -x
 
-source $(dirname $0)/version.sh
-
 cd $(dirname $0)/..
 
-TAG=${TAG:-${VERSION}${SUFFIX}}
-REPO=${REPO:-rancher}
-IMAGE_NAME=${IMAGE_NAME:-k3s}
-export K3S_IMAGE=${REPO}/${IMAGE_NAME}:${TAG}
+if [ -z "$K3S_IMAGE" ]; then
+    source $(dirname $0)/version.sh
+    TAG=${TAG:-${VERSION}${SUFFIX}}
+    REPO=${REPO:-rancher}
+    IMAGE_NAME=${IMAGE_NAME:-k3s}
+    export K3S_IMAGE=${REPO}/${IMAGE_NAME}:${TAG}
+fi
 
 OUTPUT=$(pwd)/dist/artifacts
 mkdir -p ${OUTPUT}