Skip to content

Commit

Permalink
Merge pull request #41088 from jessfraz/cherry-pick-40326
Browse files Browse the repository at this point in the history
apply #40326 on release-1.4: Prep node_e2e for GCI to COS name change
  • Loading branch information
jessfraz authored Feb 9, 2017
2 parents 43fba6d + 8663b66 commit dabd200
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/e2e_node/remote/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ func RunRemote(archive string, host string, cleanup bool, junitFilePrefix string
glog.Errorf("Issue detecting node's OS via node's /etc/os-release. Err: %v, Output:\n%s", err, output)
return "", false, fmt.Errorf("Issue detecting node's OS via node's /etc/os-release. Err: %v, Output:\n%s", err, output)
}
if strings.Contains(output, "ID=gci") {
if strings.Contains(output, "ID=gci") || strings.Contains(output, "ID=cos") {
glog.Infof("GCI node and GCI mounter both detected, modifying --experimental-mounter-path accordingly")
// Note this implicitly requires the script to be where we expect in the tarball, so if that location changes the error
// here will tell us to update the remote test runner.
Expand Down

0 comments on commit dabd200

Please sign in to comment.