From 638044a1ec31512a257bf88185a05b5db2cf8770 Mon Sep 17 00:00:00 2001 From: krousey Date: Thu, 23 Mar 2017 15:29:13 -0700 Subject: [PATCH] Revert "Fix the ETCD env vars for downgrade" --- test/e2e/framework/nodes_util.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index 2e284ce07ab..47daf021965 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -66,9 +66,9 @@ func masterUpgradeGCE(rawV string) error { // TODO: Remove these variables when they're no longer needed for downgrades. if TestContext.EtcdUpgradeVersion != "" && TestContext.EtcdUpgradeStorage != "" { env = append(env, - "ETCD_VERSION="+TestContext.EtcdUpgradeVersion, + "TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion, "STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage, - "ETCD_IMAGE=3.0.17") + "TEST_ETCD_IMAGE=3.0.17") } v := "v" + rawV