From cfd71f3777b91ca2c2d3a53d8b33a2929791d581 Mon Sep 17 00:00:00 2001
From: Vic Iglesias <viglesias@google.com>
Date: Fri, 9 Sep 2016 16:09:35 -0700
Subject: [PATCH] Temporarily update helm to work around linter issue (#70)

---
 test/Dockerfile        | 7 ++++---
 test/e2e.sh            | 2 +-
 test/publish-docker.sh | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/Dockerfile b/test/Dockerfile
index e36b0dd763..1a05bea624 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -16,7 +16,8 @@ FROM debian:8.5
 
 ENV CLOUDSDK_CORE_DISABLE_PROMPTS=1 \
   PATH=/opt/google-cloud-sdk/bin:/opt/linux-amd64/:$PATH \
-  HELM_VERSION=v2.0.0-alpha.4 \
+  HELM_VERSION=canary \
+  HELM_URL=https://storage.googleapis.com/kubernetes-charts-ci/helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \
   GOOGLE_CLOUD_SDK_VERSION=123.0.0 \
   GOOGLE_PROJECT=kubernetes-charts-ci
 
@@ -30,8 +31,8 @@ RUN set -x \
   && ./google-cloud-sdk/install.sh \
   && gcloud components install kubectl \
   && gcloud config set project ${GOOGLE_PROJECT} \
-  && wget -q https://github.com/kubernetes/helm/releases/download/${HELM_VERSION}/helm-${HELM_VERSION}-linux-amd64.tar.gz \
-  && tar xfv helm-${HELM_VERSION}-linux-amd64.tar.gz \
+  && wget -q ${HELM_URL} \
+  && tar xzfv helm-${HELM_VERSION}-linux-amd64.tar.gz \
   && apt-get -y purge wget localepurge \
   && apt-get clean \
   && cd / \
diff --git a/test/e2e.sh b/test/e2e.sh
index d1af2f16f4..337638d14d 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.5"
+IMAGE_VERSION="test-image:v1.6"
 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 a6ce61c204..78f382a991 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.4.1
+VERSION=v1.6
 CONTAINER_NAME=test-image
 
 usage() {