github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18578 from ihmccreery/quiet-upgrades

Browse Source 
Add quiet mode to gcloud calls from upgrade e2e tests
This commit is contained in:
Jeff Lowdermilk 2015-12-11 15:49:50 -08:00
commit 09f9dc7d86
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/cluster_upgrade.go
View File

@ -83,7 +83,8 @@ func masterUpgradeGKE(v string) error {
"upgrade", "upgrade",
testContext.CloudConfig.Cluster, testContext.CloudConfig.Cluster,
"--master", "--master",
fmt.Sprintf("--cluster-version=%s", v)) fmt.Sprintf("--cluster-version=%s", v),
"--quiet")
return err return err
} }
@ -141,7 +142,8 @@ func nodeUpgradeGKE(v string) error {
"clusters", "clusters",
"upgrade", "upgrade",
testContext.CloudConfig.Cluster, testContext.CloudConfig.Cluster,
fmt.Sprintf("--cluster-version=%s", v)) fmt.Sprintf("--cluster-version=%s", v),
"--quiet")
return err 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 // runCmd runs cmd using args and returns its stdout and stderr. It also outputs
// cmd's stdout and stderr to their respective OS streams. // 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) { func runCmd(command string, args ...string) (string, string, error) {
Logf("Running %s %v", command, args) Logf("Running %s %v", command, args)
var bout, berr bytes.Buffer var bout, berr bytes.Buffer