From 6aa463a9acfbfe3409f035fd8d2c59df8e69c7c9 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 10 Dec 2015 19:22:40 -0800 Subject: [PATCH] Add quiet mode to gcloud calls from upgrade e2e tests --- test/e2e/cluster_upgrade.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index 2d856f1569..3b6d2eeced 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -83,7 +83,8 @@ func masterUpgradeGKE(v string) error { "upgrade", testContext.CloudConfig.Cluster, "--master", - fmt.Sprintf("--cluster-version=%s", v)) + fmt.Sprintf("--cluster-version=%s", v), + "--quiet") return err } @@ -141,7 +142,8 @@ func nodeUpgradeGKE(v string) error { "clusters", "upgrade", testContext.CloudConfig.Cluster, - fmt.Sprintf("--cluster-version=%s", v)) + fmt.Sprintf("--cluster-version=%s", v), + "--quiet") return err } @@ -393,6 +395,9 @@ func retryCmd(command string, args ...string) (string, string, error) { // runCmd runs cmd using args and returns its stdout and stderr. It also outputs // cmd's stdout and stderr to their respective OS streams. +// +// TODO(ihmccreery) This function should either be moved into util.go or +// removed; other e2e's use bare exe.Command. func runCmd(command string, args ...string) (string, string, error) { Logf("Running %s %v", command, args) var bout, berr bytes.Buffer