From 85bc91c44c346eb98d54f9895efc9261d85e3588 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Thu, 10 Mar 2016 17:54:22 -0800
Subject: [PATCH] Add jq to the kubekins-test image and passthru
 KUBE_FORCE_VERIFY_CHECKS

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

diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh
index 77eaf9034e0..f6751ed290d 100755
--- a/hack/jenkins/gotest-dockerized.sh
+++ b/hack/jenkins/gotest-dockerized.sh
@@ -39,7 +39,8 @@ docker run --rm=true \
   -v "${REPO_DIR}":/go/src/k8s.io/kubernetes \
   -v "${WORKSPACE}/_artifacts":/workspace/artifacts \
   -v /etc/localtime:/etc/localtime:ro \
+  -e "KUBE_FORCE_VERIFY_CHECKS=${KUBE_FORCE_VERIFY_CHECKS:-}" \
   -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
   -e "REPO_DIR=${REPO_DIR}" \
-  -i gcr.io/google_containers/kubekins-test:0.7 \
+  -i gcr.io/google_containers/kubekins-test:0.8 \
   bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"
diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile
index bc8f10bbee0..4ca833a686c 100644
--- a/hack/jenkins/test-image/Dockerfile
+++ b/hack/jenkins/test-image/Dockerfile
@@ -30,6 +30,8 @@ RUN apt-get install -y file
 RUN apt-get install -y libapparmor1
 # netcat is used by integration test scripts.
 RUN apt-get install -y netcat-openbsd
+# jq is used by hack/verify-godep-licenses.sh
+RUN apt-get install -y jq
 RUN mkdir -p /go/src/k8s.io/kubernetes
 RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
 
diff --git a/hack/jenkins/test-image/Makefile b/hack/jenkins/test-image/Makefile
index 4cea80684a1..f3712715f30 100644
--- a/hack/jenkins/test-image/Makefile
+++ b/hack/jenkins/test-image/Makefile
@@ -14,7 +14,7 @@
 
 all: push
 
-TAG = 0.7
+TAG = 0.8
 
 container:
 	docker build -t gcr.io/google_containers/kubekins-test .