From 9c7da9c1164b028263072dd1aacea27ae0f34197 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Wed, 29 Jun 2016 13:15:14 -0700
Subject: [PATCH] Install pip in kubekins test image and install AWS cli when
 needed

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

diff --git a/hack/jenkins/dockerized-e2e-runner.sh b/hack/jenkins/dockerized-e2e-runner.sh
index 6772a141dd2..60666c9f423 100755
--- a/hack/jenkins/dockerized-e2e-runner.sh
+++ b/hack/jenkins/dockerized-e2e-runner.sh
@@ -61,5 +61,5 @@ docker run --rm=true -i \
   -e "WORKSPACE=/workspace" \
   "${docker_extra_args[@]:+${docker_extra_args[@]}}" \
   "${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \
-  gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev1 \
+  gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev2 \
   bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"
diff --git a/hack/jenkins/e2e-runner.sh b/hack/jenkins/e2e-runner.sh
index a8583e6b641..831ed432203 100755
--- a/hack/jenkins/e2e-runner.sh
+++ b/hack/jenkins/e2e-runner.sh
@@ -143,6 +143,9 @@ function dump_cluster_logs() {
 if running_in_docker; then
     curl -fsSL --retry 3 --keepalive-time 2 -o "${WORKSPACE}/google-cloud-sdk.tar.gz" 'https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz'
     install_google_cloud_sdk_tarball "${WORKSPACE}/google-cloud-sdk.tar.gz" /
+    if [[ "${KUBERNETES_PROVIDER}" == 'aws' ]]; then
+        pip install awscli
+    fi
 fi
 
 # Install gcloud from a custom path if provided. Used to test GKE with gcloud
diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh
index 91b0aed4958..6d7dbd395d6 100755
--- a/hack/jenkins/gotest-dockerized.sh
+++ b/hack/jenkins/gotest-dockerized.sh
@@ -44,5 +44,5 @@ docker run --rm=true \
   -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
   -e "REPO_DIR=${REPO_DIR}" \
   -e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \
-  -i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev1 \
+  -i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev2 \
   bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"
diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile
index 816f9a998da..eeba18872d7 100644
--- a/hack/jenkins/test-image/Dockerfile
+++ b/hack/jenkins/test-image/Dockerfile
@@ -29,17 +29,20 @@ WORKDIR /workspace
 # dnsutils is needed by federation cluster scripts.
 # file is used when uploading test artifacts to GCS.
 # jq is used by hack/verify-godep-licenses.sh.
+# python-pip is needed to install the AWS cli.
 # netcat is used by integration test scripts.
 RUN apt-get update && apt-get install -y \
   dnsutils \
   file \
   jq \
+  python-pip \
   netcat-openbsd \
   rsync \
   && rm -rf /var/lib/apt/lists/*
 
 RUN curl -L "https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" |\
   tar -C /usr/bin -xvzf- --strip-components=3 usr/local/bin/docker
+
 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 8c7c6c76d35..ac65beedbb4 100644
--- a/hack/jenkins/test-image/Makefile
+++ b/hack/jenkins/test-image/Makefile
@@ -16,7 +16,7 @@ all: push
 
 # Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
 # These versions are specified in the Dockerfile
-TAG = go1.6.2-docker1.9.1-rev1
+TAG = go1.6.2-docker1.9.1-rev2
 
 container:
 	docker build -t gcr.io/google_containers/kubekins-test .