github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support different image during GCE node upgrade

Browse Source
This commit is contained in:
Kris
2016-12-16 11:41:56 -08:00
parent 853fcc393e
commit 3b5bf39cfa
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/framework/nodes_util.go
View File

@@ -18,6 +18,7 @@ package framework
import (
"fmt"
"os"
"path"
"strings"
"time"
@@ -66,8 +67,7 @@ var NodeUpgrade = func(f *Framework, v string, img string) error {
var err error
switch TestContext.Provider {
case "gce":
// TODO(maisem): add GCE support for upgrading to different images.
err = nodeUpgradeGCE(v)
err = nodeUpgradeGCE(v, img)
case "gke":
err = nodeUpgradeGKE(v, img)
default:
@@ -88,8 +88,13 @@ var NodeUpgrade = func(f *Framework, v string, img string) error {
return nil
}
func nodeUpgradeGCE(rawV string) error {
func nodeUpgradeGCE(rawV, img string) error {
v := "v" + rawV
if img != "" {
env := append(os.Environ(), "KUBE_NODE_OS_DISTRIBUTION="+img)
_, _, err := RunCmdEnv(env, path.Join(TestContext.RepoRoot, "cluster/gce/upgrade.sh"), "-N", "-o", v)
return err
}
_, _, err := RunCmd(path.Join(TestContext.RepoRoot, "cluster/gce/upgrade.sh"), "-N", v)
return err
}