Added another zone, and run two in parallel

2 files changed, 12 insertions, 6 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
index 6a4d080a417..6099ecabbfb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
@@ -40,8 +40,8 @@ public class InternalDeploymentTester {
     public static final ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
             .athenzIdentity(AthenzDomain.from("domain"), AthenzService.from("service"))
             .upgradePolicy("default")
-            .region("us-west-1")
-            .region("us-east-3")
+            .region("us-central-1")
+            .parallel("us-west-1", "us-east-3")
             .build();
     public static final ApplicationId appId = ApplicationId.from("tenant", "application", "default");
 
@@ -114,6 +114,7 @@ public class InternalDeploymentTester {
 
         runJob(JobType.systemTest);
         runJob(JobType.stagingTest);
+        runJob(JobType.productionUsCentral1);
         runJob(JobType.productionUsWest1);
         runJob(JobType.productionUsEast3);
 
@@ -132,16 +133,20 @@ public class InternalDeploymentTester {
 
         runJob(JobType.systemTest);
         runJob(JobType.stagingTest);
+        runJob(JobType.productionUsCentral1);
         runJob(JobType.productionUsWest1);
         runJob(JobType.productionUsEast3);
         assertTrue(app().productionDeployments().values().stream()
                         .allMatch(deployment -> deployment.version().equals(version)));
         assertTrue(tester.configServer().nodeRepository()
+                         .list(JobType.productionAwsUsEast1a.zone(tester.controller().system()), appId).stream()
+                         .allMatch(node -> node.currentVersion().equals(version)));
+        assertTrue(tester.configServer().nodeRepository()
                          .list(JobType.productionUsEast3.zone(tester.controller().system()), appId).stream()
                          .allMatch(node -> node.currentVersion().equals(version)));
         assertTrue(tester.configServer().nodeRepository()
-                                .list(JobType.productionUsEast3.zone(tester.controller().system()), appId).stream()
-                                .allMatch(node -> node.currentVersion().equals(version)));
+                         .list(JobType.productionUsEast3.zone(tester.controller().system()), appId).stream()
+                         .allMatch(node -> node.currentVersion().equals(version)));
         assertFalse(app().change().isPresent());
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
index abaf546e535..a83415d902d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
@@ -66,6 +66,7 @@ public class InternalStepRunnerTest {
     public void canSwitchFromScrewdriver() {
         // Deploys a default application package with default build number.
         tester.tester().deployCompletely(tester.app(), InternalDeploymentTester.applicationPackage);
+        tester.setEndpoints(InternalDeploymentTester.appId, JobType.productionUsCentral1.zone(tester.tester().controller().system()));
         tester.setEndpoints(InternalDeploymentTester.appId, JobType.productionUsWest1.zone(tester.tester().controller().system()));
         tester.setEndpoints(InternalDeploymentTester.appId, JobType.productionUsEast3.zone(tester.tester().controller().system()));
 
@@ -86,7 +87,7 @@ public class InternalStepRunnerTest {
 
     @Test
     public void refeedRequirementBlocksDeployment() {
-        RunId id = tester.newRun(JobType.productionUsWest1);
+        RunId id = tester.newRun(JobType.productionUsCentral1);
         tester.configServer().setConfigChangeActions(new ConfigChangeActions(Collections.emptyList(),
                                                                                       Collections.singletonList(new RefeedAction("Refeed",
                                                                                                                         false,
@@ -101,7 +102,7 @@ public class InternalStepRunnerTest {
 
     @Test
     public void restartsServicesAndWaitsForRestartAndReboot() {
-        RunId id = tester.newRun(JobType.productionUsWest1);
+        RunId id = tester.newRun(JobType.productionUsCentral1);
         ZoneId zone = id.type().zone(tester.tester().controller().system());
         HostName host = tester.configServer().hostFor(InternalDeploymentTester.appId, zone);
         tester.configServer().setConfigChangeActions(new ConfigChangeActions(Collections.singletonList(new RestartAction("cluster",