From 9bdd02b60fb2fab8c91b1f255b18fc49d2b80879 Mon Sep 17 00:00:00 2001
From: Vic Iglesias <viglesias@google.com>
Date: Wed, 14 Sep 2016 13:59:30 -0700
Subject: [PATCH] Use helm canary (#76)

---
 test/Dockerfile        |  8 ++------
 test/changed.sh        | 10 +++++++++-
 test/e2e.sh            |  2 +-
 test/publish-docker.sh |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/test/Dockerfile b/test/Dockerfile
index 6b87951bc9..476059c8d0 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -15,9 +15,7 @@
 FROM debian:8.5
 
 ENV CLOUDSDK_CORE_DISABLE_PROMPTS=1 \
-  PATH=/opt/google-cloud-sdk/bin:/opt/linux-amd64/:$PATH \
-  HELM_VERSION=canary \
-  HELM_URL=https://storage.googleapis.com/kubernetes-charts-ci/helm/helm-canary-linux-amd64.tar.gz \
+  PATH=/opt/google-cloud-sdk/bin:$PATH \
   GOOGLE_CLOUD_SDK_VERSION=123.0.0 \
   GOOGLE_PROJECT=kubernetes-charts-ci
 
@@ -31,9 +29,7 @@ RUN set -x \
   && ./google-cloud-sdk/install.sh \
   && gcloud components install kubectl \
   && gcloud config set project ${GOOGLE_PROJECT}
-RUN cd /opt && wget -q ${HELM_URL} \
-  && tar xzfv helm-${HELM_VERSION}-linux-amd64.tar.gz
-RUN apt-get -y purge wget localepurge \
+RUN apt-get -y purge localepurge \
   && apt-get clean \
   && cd / \
   && rm -rf \
diff --git a/test/changed.sh b/test/changed.sh
index 5e7249782b..a38223fb6e 100755
--- a/test/changed.sh
+++ b/test/changed.sh
@@ -31,7 +31,15 @@ trap cleanup EXIT
 gcloud auth activate-service-account --key-file="${GOOGLE_APPLICATION_CREDENTIALS}"
 gcloud container clusters get-credentials jenkins --project kubernetes-charts-ci --zone us-west1-a
 
-# Initialize helm/tiller
+# Install and initialize helm/tiller
+HELM_URL=https://storage.googleapis.com/kubernetes-helm
+HELM_TARBALL=helm-canary-linux-amd64.tar.gz
+pushd /opt
+  wget -q ${HELM_URL}/${HELM_TARBALL}
+  tar xzfv ${HELM_TARBALL}
+  PATH=/opt/linux-amd64/:$PATH
+popd
+
 helm init --client-only
 
 # Iterate over each of the changed charts
diff --git a/test/e2e.sh b/test/e2e.sh
index 38d5a560b3..720b75cc6b 100755
--- a/test/e2e.sh
+++ b/test/e2e.sh
@@ -18,7 +18,7 @@ set -o nounset
 set -o pipefail
 
 # TODO should we inject this.  This is creating problems bumping the Docker version
-IMAGE_VERSION="test-image:v1.9"
+IMAGE_VERSION="test-image:v1.10"
 CHART_ROOT=${CHART_ROOT:-$(git rev-parse --show-toplevel)}
 IMAGE_NAME=${IMAGE_NAME:-"gcr.io/kubernetes-charts-ci/${IMAGE_VERSION}"}
 
diff --git a/test/publish-docker.sh b/test/publish-docker.sh
index 88895fbaf6..d2a215930c 100755
--- a/test/publish-docker.sh
+++ b/test/publish-docker.sh
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-VERSION=v1.9
+VERSION=v1.10
 CONTAINER_NAME=test-image
 
 usage() {