Support production test jobs

1 files changed, 44 insertions, 1 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 4bbc65eee9f..1b8f9f25a80 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
@@ -35,37 +35,71 @@ public enum JobType {
     productionUsEast3      ("production-us-east-3",
                             Map.of(main, ZoneId.from("prod"   , "us-east-3"))),
 
+    testUsEast3            ("test-us-east-3",
+                            Map.of(main, ZoneId.from("prod"   , "us-east-3")), true),
+
     productionUsWest1      ("production-us-west-1",
                             Map.of(main, ZoneId.from("prod"   , "us-west-1"))),
 
+    testUsWest1            ("test-us-west-1",
+                            Map.of(main, ZoneId.from("prod"   , "us-west-1")), true),
+
     productionUsCentral1   ("production-us-central-1",
                             Map.of(main, ZoneId.from("prod"   , "us-central-1"))),
 
+    testUsCentral1         ("test-us-central-1",
+                            Map.of(main, ZoneId.from("prod"   , "us-central-1")), true),
+
     productionApNortheast1 ("production-ap-northeast-1",
                             Map.of(main, ZoneId.from("prod"   , "ap-northeast-1"))),
 
+    testApNortheast1       ("test-ap-northeast-1",
+                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-1")), true),
+
     productionApNortheast2 ("production-ap-northeast-2",
                             Map.of(main, ZoneId.from("prod"   , "ap-northeast-2"))),
 
+    testApNortheast2       ("test-ap-northeast-2",
+                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-2")), true),
+
     productionApSoutheast1 ("production-ap-southeast-1",
                             Map.of(main, ZoneId.from("prod"   , "ap-southeast-1"))),
 
+    testApSoutheast1       ("test-ap-southeast-1",
+                            Map.of(main, ZoneId.from("prod"   , "ap-southeast-1")), true),
+
     productionEuWest1      ("production-eu-west-1",
                             Map.of(main, ZoneId.from("prod"   , "eu-west-1"))),
 
+    testEuWest1            ("test-eu-west-1",
+                            Map.of(main, ZoneId.from("prod"   , "eu-west-1")), true),
+
     productionAwsUsEast1a  ("production-aws-us-east-1a",
                             Map.of(main, ZoneId.from("prod"   , "aws-us-east-1a"))),
 
+    testAwsUsEast1a        ("test-aws-us-east-1a",
+                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1a")), true),
+
     productionAwsUsEast1c  ("production-aws-us-east-1c",
                             Map.of(PublicCd, ZoneId.from("prod", "aws-us-east-1c"),
                                    Public,   ZoneId.from("prod", "aws-us-east-1c"))),
 
+    testAwsUsEast1c        ("test-aws-us-east-1c",
+                            Map.of(PublicCd, ZoneId.from("prod", "aws-us-east-1c"),
+                                   Public,   ZoneId.from("prod", "aws-us-east-1c")), true),
+
     productionAwsUsWest2a  ("production-aws-us-west-2a",
                             Map.of(main, ZoneId.from("prod"   , "aws-us-west-2a"))),
 
+    testAwsUsWest2a        ("test-aws-us-west-2a",
+                            Map.of(main, ZoneId.from("prod"   , "aws-us-west-2a")), true),
+
     productionAwsUsEast1b  ("production-aws-us-east-1b",
                             Map.of(main, ZoneId.from("prod"   , "aws-us-east-1b"))),
 
+    testAwsUsEast1b        ("test-aws-us-east-1b",
+                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1b")), true),
+
     devUsEast1             ("dev-us-east-1",
                             Map.of(main, ZoneId.from("dev"    , "us-east-1"))),
 
@@ -75,9 +109,15 @@ public enum JobType {
     productionCdAwsUsEast1a("production-cd-aws-us-east-1a",
                             Map.of(cd  , ZoneId.from("prod"   , "cd-aws-us-east-1a"))),
 
+    testCdAwsUsEast1a      ("test-cd-aws-us-east-1a",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-aws-us-east-1a")), true),
+
     productionCdUsCentral1 ("production-cd-us-central-1",
                             Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-1"))),
 
+    testCdUsCentral1       ("test-cd-us-central-1",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-1")), true),
+
     // TODO: Cannot remove production-cd-us-central-2 until we know there are no serialized data in controller referencing it
     productionCdUsCentral2 ("production-cd-us-central-2",
                             Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-2"))),
@@ -85,6 +125,9 @@ public enum JobType {
     productionCdUsWest1    ("production-cd-us-west-1",
                             Map.of(cd  , ZoneId.from("prod"   , "cd-us-west-1"))),
 
+    testCdUsWest1          ("test-cd-us-west-1",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-west-1")), true),
+
     devCdUsCentral1        ("dev-cd-us-central-1",
                             Map.of(cd  , ZoneId.from("dev"    , "cd-us-central-1"))),
 
@@ -164,7 +207,7 @@ public enum JobType {
     }
 
     /** Returns the production test job type for the given environment and region or null if none */
-    public static Optional<JobType> from(SystemName system, RegionName region) {
+    public static Optional<JobType> testFrom(SystemName system, RegionName region) {
         return from(system, ZoneId.from(Environment.prod, region), true);
     }