From ad8ea35d94cc7c0d0798bcefc3ba7e3cc2b9389d Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Tue, 19 Jan 2016 15:08:39 -0800
Subject: [PATCH] Update kubekins-test image to include netcat

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

diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh
index eac78d313cd..ab44d69e419 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.5 \
+  -i gcr.io/google_containers/kubekins-test:0.6 \
   bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"
diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile
index 09db44adc15..2fb3928f08d 100644
--- a/hack/jenkins/test-image/Dockerfile
+++ b/hack/jenkins/test-image/Dockerfile
@@ -24,8 +24,12 @@ ENV TERM                    xterm
 WORKDIR /workspace
 
 RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y rsync
+# file is used when uploading test artifacts to GCS.
+RUN apt-get install -y file
 # libapparmor1 is needed for docker-in-docker.
-RUN apt-get install -y file libapparmor1
+RUN apt-get install -y libapparmor1
+# netcat is used by integration test scripts.
+RUN apt-get install -y netcat-openbsd
 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 d6525c11279..650e0f98109 100644
--- a/hack/jenkins/test-image/Makefile
+++ b/hack/jenkins/test-image/Makefile
@@ -1,6 +1,6 @@
 all: push
 
-TAG = 0.5
+TAG = 0.6
 
 container:
 	docker build -t gcr.io/google_containers/kubekins-test .