From 39965b67cea18d019dbb8eb261eba40f8c4a75d9 Mon Sep 17 00:00:00 2001
From: Jeff Lowdermilk <jeffml@google.com>
Date: Thu, 29 Oct 2015 17:12:57 -0700
Subject: [PATCH] Move branch-specific test env out of the kubekins-test image

---
 hack/jenkins/gotest-dockerized.sh  | 2 +-
 hack/jenkins/test-dockerized.sh    | 4 +++-
 hack/jenkins/test-image/Dockerfile | 2 --
 hack/jenkins/test-image/Makefile   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh
index 59ea0c1b406..2443533a402 100755
--- a/hack/jenkins/gotest-dockerized.sh
+++ b/hack/jenkins/gotest-dockerized.sh
@@ -42,5 +42,5 @@ docker run --rm=true \
   -v "${REPO_DIR}":/go/src/k8s.io/kubernetes \
   -v "${KUBE_JUNIT_REPORT_DIR}":/workspace/artifacts \
   --env REPO_DIR="${REPO_DIR}" \
-  -i gcr.io/google_containers/kubekins-test:0.1 \
+  -i gcr.io/google_containers/kubekins-test:0.2 \
   bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"
diff --git a/hack/jenkins/test-dockerized.sh b/hack/jenkins/test-dockerized.sh
index 518ec3a1f93..876dc2a60e3 100755
--- a/hack/jenkins/test-dockerized.sh
+++ b/hack/jenkins/test-dockerized.sh
@@ -40,12 +40,14 @@ export KUBE_KEEP_VERBOSE_TEST_OUTPUT=y
 export KUBE_TIMEOUT='-timeout 300s'
 export KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4
 export LOG_LEVEL=4
+export KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1
+export KUBE_TEST_ETCD_PREFIXES=registry
 
 ./hack/build-go.sh
 godep go install ./...
 ./hack/install-etcd.sh
 
-./hack/verify-all.sh
+./hack/verify-all.sh -v
 
 ./hack/test-go.sh -- -p=2
 ./hack/test-cmd.sh
diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile
index 70457150e01..17f624a8985 100644
--- a/hack/jenkins/test-image/Dockerfile
+++ b/hack/jenkins/test-image/Dockerfile
@@ -18,8 +18,6 @@
 FROM golang:1.4
 MAINTAINER  Jeff Lowdermilk <jeffml@google.com>
 
-ENV KUBE_TEST_API_VERSIONS  v1,extensions/v1beta1
-ENV KUBE_TEST_ETCD_PREFIXES registry
 ENV WORKSPACE               /workspace
 ENV TERM                    xterm
 
diff --git a/hack/jenkins/test-image/Makefile b/hack/jenkins/test-image/Makefile
index b9fb7bfe94f..c2caacf935d 100644
--- a/hack/jenkins/test-image/Makefile
+++ b/hack/jenkins/test-image/Makefile
@@ -1,6 +1,6 @@
 all: push
 
-TAG = 0.1
+TAG = 0.2
 
 container:
 	docker build -t gcr.io/google_containers/kubekins-test .