From 9b599149af6ab3403232a336392ed832fff811e7 Mon Sep 17 00:00:00 2001
From: Vic Iglesias <viglesias@google.com>
Date: Wed, 21 Jun 2017 11:30:41 -0700
Subject: [PATCH] gcloud docker images now is based on debian

---
 tests/tasks/deploy-sample-app.yaml | 6 ++----
 tests/tasks/install-jenkins.yaml   | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/tasks/deploy-sample-app.yaml b/tests/tasks/deploy-sample-app.yaml
index 98c9e84..bf98af1 100644
--- a/tests/tasks/deploy-sample-app.yaml
+++ b/tests/tasks/deploy-sample-app.yaml
@@ -20,9 +20,7 @@ run:
     cat > service_account.json <<EOF
     $service_account_json
     EOF
-    # Initialize gcloud
-    apk add --update git openssl
-    echo y | gcloud components install kubectl
+    apt-get install -y git openssl
     gcloud auth activate-service-account --key-file=service_account.json
     gcloud config set project $project_id
     gcloud config set compute/zone $zone
@@ -31,4 +29,4 @@ run:
     # Setup email
     echo "CD on K8s: Failed to deploy sample-app" > ../email/subject-failed
 
-    ./tests/scripts/deploy-sample-app.sh
+    ./tests/scripts/deploy-sample-app.sh && ./tests/scripts/cleanup.sh
diff --git a/tests/tasks/install-jenkins.yaml b/tests/tasks/install-jenkins.yaml
index 9b3ffa3..455b96b 100644
--- a/tests/tasks/install-jenkins.yaml
+++ b/tests/tasks/install-jenkins.yaml
@@ -20,9 +20,7 @@ run:
     cat > service_account.json <<EOF
     $service_account_json
     EOF
-    # Initialize gcloud
-    apk add --update git openssl
-    echo y | gcloud components install kubectl
+    apt-get install -y git openssl
     gcloud auth activate-service-account --key-file=service_account.json
     gcloud config set project $project_id
     gcloud config set compute/zone $zone