From c8faf0b1f2a7d9320f00a91252a909df3cb0e1e2 Mon Sep 17 00:00:00 2001
From: Joe Finney <spxtr@google.com>
Date: Mon, 4 Jan 2016 11:09:59 -0800
Subject: [PATCH] Clean up e2e logs.

Unsets xtrace in e2e.sh, sets it in e2e-runner.sh.
Sets quiet flag for gcloud cp.
---
 hack/jenkins/e2e-runner.sh | 6 +++++-
 hack/jenkins/e2e.sh        | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hack/jenkins/e2e-runner.sh b/hack/jenkins/e2e-runner.sh
index b6deaaf4b9..d676f54a92 100755
--- a/hack/jenkins/e2e-runner.sh
+++ b/hack/jenkins/e2e-runner.sh
@@ -19,6 +19,7 @@
 set -o errexit
 set -o nounset
 set -o pipefail
+set -o xtrace
 
 echo "--------------------------------------------------------------------------------"
 echo "Test Environment:"
@@ -67,7 +68,10 @@ if [[ "${E2E_UP,,}" == "true" || "${JENKINS_FORCE_GET_TARS:-}" =~ ^[yY]$ ]]; the
         # At this point, we want to have the following vars set:
         # - bucket
         # - build_version
-        gsutil -m cp gs://kubernetes-release/${bucket}/${build_version}/kubernetes.tar.gz gs://kubernetes-release/${bucket}/${build_version}/kubernetes-test.tar.gz .
+        gsutil -mq cp \
+            "gs://kubernetes-release/${bucket}/${build_version}/kubernetes.tar.gz" \
+            "gs://kubernetes-release/${bucket}/${build_version}/kubernetes-test.tar.gz" \
+            .
 
         # Set by GKE-CI to change the CLUSTER_API_VERSION to the git version
         if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 2d131bd2a0..704f15345e 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -20,7 +20,6 @@
 set -o errexit
 set -o nounset
 set -o pipefail
-set -o xtrace
 
 # Join all args with |
 #   Example: join_regex_allow_empty a b "c d" e  =>  a|b|c d|e