Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add quiet mode to gcloud calls from upgrade e2e tests #18578

Merged
merged 1 commit into from
Dec 11, 2015
Merged

Add quiet mode to gcloud calls from upgrade e2e tests #18578

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions test/e2e/cluster_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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
Expand Down