Skip to content

Commit

Permalink
Merge pull request #47146 from MrHohn/automated-cherry-pick-of-#46997…
Browse files Browse the repository at this point in the history
…-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #46997

Cherry pick of #46997 on release-1.6.

#46997: Don't parse human-readable output from gcloud in tests

**Release note**:

```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue committed Jun 8, 2017
2 parents 011a4e6 + 5be4bd3 commit 3be4ea3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/e2e/framework/google_compute.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func CreateGCEStaticIP(name string) (string, error) {
for attempts := 0; attempts < 4; attempts++ {
outputBytes, err = exec.Command("gcloud", "compute", "addresses", "create",
name, "--project", TestContext.CloudConfig.ProjectID,
"--region", region, "-q").CombinedOutput()
"--region", region, "-q", "--format=yaml").CombinedOutput()
if err == nil {
break
}
Expand Down

0 comments on commit 3be4ea3

Please sign in to comment.