test: enable scale/upgrade for base E2E cluster config (#2670)

Azure · Feb 3, 2020 · e93b58c · e93b58c
1 parent 2858d8e
commit e93b58c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -1,5 +1,8 @@
 {
-	"env": {},
+	"env": {
+		"SCALE_CLUSTER": true,
+		"UPGRADE_CLUSTER": true
+	},
 	"apiModel": {
 		"apiVersion": "vlabs",
 		"properties": {