From e93b58c0c838796173e7b3686365eda5da1d0e02 Mon Sep 17 00:00:00 2001
From: Jack Francis <jackfrancis@gmail.com>
Date: Mon, 3 Feb 2020 09:17:10 -0800
Subject: [PATCH] test: enable scale/upgrade for base E2E cluster config
 (#2670)

---
 Jenkinsfile                             | 2 +-
 test/e2e/test_cluster_configs/base.json | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index de4830f985..f697a77407 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -165,7 +165,7 @@ stage ("discover tests") {
 					echo("${jobName} is limted to '${jobCfg.options?.allowedOrchestratorVersions}'; running for ${version}")
 				}
 
-				if(params.UPGRADE_CLUSTER) {
+				if(params.UPGRADE_CLUSTER || jobCfg.env["UPGRADE_CLUSTER"])  {
 					// we are upgrading, so we need to determine the next logical version to upgrade
 					tasks = tasks + tasksForUpgradeJob(jobCfg, aksEngineAllVersions, jobName, version)
 				} else {
diff --git a/test/e2e/test_cluster_configs/base.json b/test/e2e/test_cluster_configs/base.json
index 80b39e33b9..1b486b22dc 100644
--- a/test/e2e/test_cluster_configs/base.json
+++ b/test/e2e/test_cluster_configs/base.json
@@ -1,5 +1,8 @@
 {
-	"env": {},
+	"env": {
+		"SCALE_CLUSTER": true,
+		"UPGRADE_CLUSTER": true
+	},
 	"apiModel": {
 		"apiVersion": "vlabs",
 		"properties": {