diff options
author | jonmv <venstad@gmail.com> | 2022-04-16 18:54:16 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-04-19 10:38:07 +0200 |
commit | 71e513bd92b5fe7ae65bbb34593fd4b3c5baf66a (patch) | |
tree | 5afe1e7c4bbb7c009bcac55682e7fd095ddd4909 /controller-server/src/test/java/com/yahoo | |
parent | 1ee0c39cd68848d54ce987ebb4d7bb2bf214ae67 (diff) |
Let JobType.allIn use provided zones
Diffstat (limited to 'controller-server/src/test/java/com/yahoo')
2 files changed, 10 insertions, 14 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java index a4221ff3564..7f2799b6f58 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java @@ -83,7 +83,7 @@ public class CloudTrialExpirerTest { .withSystem(tester.zoneRegistry().system()) .withId("prod." + regionName) .build(); - tester.zoneRegistry().setZones(zone); + tester.zoneRegistry().setZones(ZoneApiMock.fromId("test.aws-us-east-1c"), ZoneApiMock.fromId("staging.aws-us-east-1c"), zone); var app = tester.createApplication(tenantName, appName, instanceName); var ctx = deploymentTester.newDeploymentContext(tenantName, appName, instanceName); var pkg = new ApplicationPackageBuilder() diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json index f09b60efacc..9c34f9410ee 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json @@ -353,25 +353,21 @@ "jobs": [ "system-test", "staging-test", - "production-us-east-3", - "test-us-east-3", - "production-us-west-1", - "test-us-west-1", - "production-us-central-1", - "test-us-central-1", + "production-aws-us-east-1a", + "test-aws-us-east-1a", "production-ap-northeast-1", "test-ap-northeast-1", "production-ap-northeast-2", "test-ap-northeast-2", "production-ap-southeast-1", "test-ap-southeast-1", + "production-us-east-3", + "test-us-east-3", + "production-us-west-1", + "test-us-west-1", + "production-us-central-1", + "test-us-central-1", "production-eu-west-1", - "test-eu-west-1", - "production-aws-us-east-1a", - "test-aws-us-east-1a", - "production-aws-us-west-2a", - "test-aws-us-west-2a", - "production-aws-us-east-1b", - "test-aws-us-east-1b" + "test-eu-west-1" ] } |