Skip to content

K
k3s
Commit 09f9dc7d authored by Jeff Lowdermilk's avatar Jeff Lowdermilk
Browse files
Options

Merge pull request #18578 from ihmccreery/quiet-upgrades

Add quiet mode to gcloud calls from upgrade e2e tests
parents 9f3d28c7 6aa463a9
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
test/e2e/cluster_upgrade.go
View file @ 09f9dc7d
...@@ -83,7 +83,8 @@ func masterUpgradeGKE(v string) error { ...@@ -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 { ...@@ -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) { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment