diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-06-14 17:36:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-14 17:36:54 +0200 |
| commit | 05617553a3f8d563c1955b82e81c54f4cb2136b5 (patch) | |
| tree | 7b473499d81cd6f6958e3fe16bb03a9c1ee74f5d | |
| parent | 7a620f9c8f8c1895c28707f5bc633330fa580b1a (diff) | |
| parent | 8b1315242a2595d0e4868a4f4896cee0ba6abe31 (diff) | |
Merge pull request #18250 from vespa-engine/jonmv/add-missing-test-job-type
Jonmv/add missing test job type MERGEOK
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java index 35b1a238325..9bcb80f24ee 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java @@ -91,18 +91,22 @@ public enum JobType { productionAwsApNortheast1a ("production-aws-ap-northeast-1a", Map.of(Public, ZoneId.from("prod", "aws-ap-northeast-1a"))), + testAwsApNortheast1a ("test-aws-ap-northeast-1a", + Map.of(Public, ZoneId.from("prod", "aws-ap-northeast-1a")), true), + productionAwsEuWest1a ("production-aws-eu-west-1a", Map.of(Public, ZoneId.from("prod", "aws-eu-west-1a"))), - testAwsApNortheast1a ("test-aws-ap-northeast-1a", - Map.of(Public, ZoneId.from("prod", "aws-ap-northeast-1a")), true), + testAwsEuWest1a ("test-aws-eu-west-1a", + Map.of(Public, ZoneId.from("prod", "aws-eu-west-1a")), true), productionAwsUsWest2a ("production-aws-us-west-2a", Map.of(main, ZoneId.from("prod", "aws-us-west-2a"), Public, ZoneId.from("prod", "aws-us-west-2a"))), testAwsUsWest2a ("test-aws-us-west-2a", - Map.of(main, ZoneId.from("prod" , "aws-us-west-2a")), true), + Map.of(main, ZoneId.from("prod", "aws-us-west-2a"), + Public, ZoneId.from("prod", "aws-us-west-2a")), true), productionAwsUsEast1b ("production-aws-us-east-1b", Map.of(main, ZoneId.from("prod" , "aws-us-east-1b"))), @@ -132,6 +136,9 @@ public enum JobType { productionCdUsCentral2 ("production-cd-us-central-2", Map.of(cd , ZoneId.from("prod" , "cd-us-central-2"))), + testCdUsCentral2 ("test-cd-us-central-2", + Map.of(cd , ZoneId.from("prod" , "cd-us-central-2")), true), + productionCdUsWest1 ("production-cd-us-west-1", Map.of(cd , ZoneId.from("prod" , "cd-us-west-1"))), @@ -155,7 +162,7 @@ public enum JobType { Map.of(main, ZoneId.from("perf" , "us-east-3"))); private final String jobName; - private final Map<SystemName, ZoneId> zones; + final Map<SystemName, ZoneId> zones; private final boolean isProductionTest; JobType(String jobName, Map<SystemName, ZoneId> zones, boolean isProductionTest) { |