diff options
| author | Torbjørn Smørgrav <smorgrav@users.noreply.github.com> | 2019-10-01 21:11:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 21:11:28 +0200 |
| commit | eec532266981a868d00a74e87526a70f092eb3d5 (patch) | |
| tree | f4aba20e3f85736e7d36ce11b48d25afd41ca4bb /controller-api | |
| parent | f7caa458f044780fa005683145deeb346470ab5f (diff) | |
| parent | 334a28448288e5af8ac3bd5c502042d09afb2614 (diff) | |
Merge pull request #10834 from vespa-engine/smorgrav/public_job_types
Add test, staging and prod zones to job types
Diffstat (limited to 'controller-api')
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java | 9 |
1 files changed, 6 insertions, 3 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 5f8e2f886a2..9881002659d 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 @@ -26,12 +26,14 @@ public enum JobType { systemTest ("system-test", Map.of(main , ZoneId.from("test", "us-east-1"), cd , ZoneId.from("test", "cd-us-central-1"), - PublicCd, ZoneId.from("test", "aws-us-east-1c"))), + PublicCd, ZoneId.from("test", "aws-us-east-1c"), + Public , ZoneId.from("test", "aws-us-east-1c"))), stagingTest ("staging-test", Map.of(main , ZoneId.from("staging", "us-east-3"), cd , ZoneId.from("staging", "cd-us-central-1"), - PublicCd, ZoneId.from("staging", "aws-us-east-1c"))), + PublicCd, ZoneId.from("staging", "aws-us-east-1c"), + Public , ZoneId.from("staging", "aws-us-east-1c"))), productionUsEast3 ("production-us-east-3", Map.of(main, ZoneId.from("prod" , "us-east-3"))), @@ -58,7 +60,8 @@ public enum JobType { Map.of(main, ZoneId.from("prod" , "aws-us-east-1a"))), productionAwsUsEast1c ("production-aws-us-east-1c", - Map.of(PublicCd, ZoneId.from("prod", "aws-us-east-1c"))), + Map.of(PublicCd, ZoneId.from("prod", "aws-us-east-1c"), + Public, ZoneId.from("prod", "aws-us-east-1c"))), productionAwsUsWest2a ("production-aws-us-west-2a", Map.of(main, ZoneId.from("prod" , "aws-us-west-2a"))), |