Merge pull request #43481 from krousey/downgrades

Automatic merge from submit-queue (batch tested with PRs 43481, 43419, 42741, 43480) Add ETCD env vars for downgrade This is a partial fix for https://github.com/kubernetes/kubernetes/issues/43470

Merge pull request #43481 from krousey/downgrades
5c184755 · Kubernetes Submit Queue · GitHub · 321acf00 · 723d301b · 5c184755
Commit 5c184755 authored Mar 21, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

nodes_util.go test/e2e/framework/nodes_util.go +10 -1

No files found.
--- a/test/e2e/framework/nodes_util.go
+++ b/test/e2e/framework/nodes_util.go
@@ -62,8 +62,17 @@ func etcdUpgradeGCE(target_storage, target_version string) error {
 }

 func masterUpgradeGCE(rawV string) error {
+	env := os.Environ()
+	// TODO: Remove these variables when they're no longer needed for downgrades.
+	if TestContext.EtcdUpgradeVersion != "" && TestContext.EtcdUpgradeStorage != "" {
+		env = append(env,
+			"TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion,
+			"STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage,
+			"TEST_ETCD_IMAGE=3.0.17")
+	}
+
 	v := "v" + rawV
-	_, _, err := RunCmd(gceUpgradeScript(), "-M", v)
+	_, _, err := RunCmdEnv(env, gceUpgradeScript(), "-M", v)
 	return err
 }