Revert "Remove compatibility serialisation for revisions, and add (de-) for job types"

4 files changed, 105 insertions, 272 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 e9231f80091..52b43ac475a 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
@@ -5,230 +5,173 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
 
-import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static ai.vespa.validation.Validation.require;
-import static com.yahoo.config.provision.Environment.prod;
-import static com.yahoo.config.provision.Environment.staging;
-import static com.yahoo.config.provision.Environment.test;
 import static com.yahoo.config.provision.SystemName.Public;
 import static com.yahoo.config.provision.SystemName.PublicCd;
 import static com.yahoo.config.provision.SystemName.cd;
 import static com.yahoo.config.provision.SystemName.main;
 
 /** Job types that exist in the build system */
-public final class JobType implements Comparable<JobType> {
+public enum JobType {
 //     | enum name ------------| job name ------------------| Zone in main system ---------------------------------------| Zone in CD system -------------------------------------------
-    public static final JobType systemTest         = of("system-test",
+    systemTest             ("system-test",
                             Map.of(main    , ZoneId.from("test", "us-east-1"),
                                    cd      , ZoneId.from("test", "cd-us-west-1"),
                                    PublicCd, ZoneId.from("test", "aws-us-east-1c"),
-                                   Public  , ZoneId.from("test", "aws-us-east-1c")));
+                                   Public  , ZoneId.from("test", "aws-us-east-1c"))),
 
-    public static final JobType stagingTest        = of("staging-test",
+    stagingTest            ("staging-test",
                             Map.of(main    , ZoneId.from("staging", "us-east-3"),
                                    cd      , ZoneId.from("staging", "cd-us-west-1"),
                                    PublicCd, ZoneId.from("staging", "aws-us-east-1c"),
-                                   Public  , ZoneId.from("staging", "aws-us-east-1c")));
+                                   Public  , ZoneId.from("staging", "aws-us-east-1c"))),
 
-    public static final JobType productionUsEast3  = of("production-us-east-3",
-                            Map.of(main, ZoneId.from("prod"   , "us-east-3")));
+    productionUsEast3      ("production-us-east-3",
+                            Map.of(main, ZoneId.from("prod"   , "us-east-3"))),
 
-    public static final JobType testUsEast3        = of("test-us-east-3",
-                            Map.of(main, ZoneId.from("prod"   , "us-east-3")), true);
+    testUsEast3            ("test-us-east-3",
+                            Map.of(main, ZoneId.from("prod"   , "us-east-3")), true),
 
-    public static final JobType productionUsWest1  = of("production-us-west-1",
-                            Map.of(main, ZoneId.from("prod"   , "us-west-1")));
+    productionUsWest1      ("production-us-west-1",
+                            Map.of(main, ZoneId.from("prod"   , "us-west-1"))),
 
-    public static final JobType testUsWest1        = of("test-us-west-1",
-                            Map.of(main, ZoneId.from("prod"   , "us-west-1")), true);
+    testUsWest1            ("test-us-west-1",
+                            Map.of(main, ZoneId.from("prod"   , "us-west-1")), true),
 
-    public static final JobType productionUsCentral1 = of("production-us-central-1",
-                            Map.of(main, ZoneId.from("prod"   , "us-central-1")));
+    productionUsCentral1   ("production-us-central-1",
+                            Map.of(main, ZoneId.from("prod"   , "us-central-1"))),
 
-    public static final JobType testUsCentral1     = of("test-us-central-1",
-                            Map.of(main, ZoneId.from("prod"   , "us-central-1")), true);
+    testUsCentral1         ("test-us-central-1",
+                            Map.of(main, ZoneId.from("prod"   , "us-central-1")), true),
 
-    public static final JobType productionApNortheast1 = of("production-ap-northeast-1",
-                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-1")));
+    productionApNortheast1 ("production-ap-northeast-1",
+                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-1"))),
 
-    public static final JobType testApNortheast1   = of("test-ap-northeast-1",
-                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-1")), true);
+    testApNortheast1       ("test-ap-northeast-1",
+                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-1")), true),
 
-    public static final JobType productionApNortheast2 = of("production-ap-northeast-2",
-                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-2")));
+    productionApNortheast2 ("production-ap-northeast-2",
+                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-2"))),
 
-    public static final JobType testApNortheast2   = of("test-ap-northeast-2",
-                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-2")), true);
+    testApNortheast2       ("test-ap-northeast-2",
+                            Map.of(main, ZoneId.from("prod"   , "ap-northeast-2")), true),
 
-    public static final JobType productionApSoutheast1 = of("production-ap-southeast-1",
-                            Map.of(main, ZoneId.from("prod"   , "ap-southeast-1")));
+    productionApSoutheast1 ("production-ap-southeast-1",
+                            Map.of(main, ZoneId.from("prod"   , "ap-southeast-1"))),
 
-    public static final JobType testApSoutheast1   = of("test-ap-southeast-1",
-                            Map.of(main, ZoneId.from("prod"   , "ap-southeast-1")), true);
+    testApSoutheast1       ("test-ap-southeast-1",
+                            Map.of(main, ZoneId.from("prod"   , "ap-southeast-1")), true),
 
-    public static final JobType productionEuWest1  = of("production-eu-west-1",
-                            Map.of(main, ZoneId.from("prod"   , "eu-west-1")));
+    productionEuWest1      ("production-eu-west-1",
+                            Map.of(main, ZoneId.from("prod"   , "eu-west-1"))),
 
-    public static final JobType testEuWest1        = of("test-eu-west-1",
-                            Map.of(main, ZoneId.from("prod"   , "eu-west-1")), true);
+    testEuWest1            ("test-eu-west-1",
+                            Map.of(main, ZoneId.from("prod"   , "eu-west-1")), true),
 
-    public static final JobType productionAwsUsEast1a= of("production-aws-us-east-1a",
-                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1a")));
+    productionAwsUsEast1a  ("production-aws-us-east-1a",
+                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1a"))),
 
-    public static final JobType testAwsUsEast1a    = of("test-aws-us-east-1a",
-                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1a")), true);
+    testAwsUsEast1a        ("test-aws-us-east-1a",
+                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1a")), true),
 
-    public static final JobType productionAwsUsEast1c= of("production-aws-us-east-1c",
+    productionAwsUsEast1c  ("production-aws-us-east-1c",
                             Map.of(PublicCd, ZoneId.from("prod", "aws-us-east-1c"),
-                                   Public,   ZoneId.from("prod", "aws-us-east-1c")));
+                                   Public,   ZoneId.from("prod", "aws-us-east-1c"))),
 
-    public static final JobType testAwsUsEast1c    = of("test-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);
+                                   Public,   ZoneId.from("prod", "aws-us-east-1c")), true),
 
-    public static final JobType productionAwsApNortheast1a= of("production-aws-ap-northeast-1a",
-                            Map.of(Public, ZoneId.from("prod", "aws-ap-northeast-1a")));
+    productionAwsApNortheast1a  ("production-aws-ap-northeast-1a",
+                            Map.of(Public, ZoneId.from("prod", "aws-ap-northeast-1a"))),
 
-    public static final JobType testAwsApNortheast1a = of("test-aws-ap-northeast-1a",
-                            Map.of(Public, ZoneId.from("prod", "aws-ap-northeast-1a")), true);
+    testAwsApNortheast1a   ("test-aws-ap-northeast-1a",
+                            Map.of(Public, ZoneId.from("prod", "aws-ap-northeast-1a")), true),
 
-    public static final JobType productionAwsEuWest1a= of("production-aws-eu-west-1a",
-                            Map.of(Public, ZoneId.from("prod", "aws-eu-west-1a")));
+    productionAwsEuWest1a  ("production-aws-eu-west-1a",
+                            Map.of(Public, ZoneId.from("prod", "aws-eu-west-1a"))),
 
-    public static final JobType testAwsEuWest1a     = of("test-aws-eu-west-1a",
-                            Map.of(Public, ZoneId.from("prod", "aws-eu-west-1a")), true);
+    testAwsEuWest1a         ("test-aws-eu-west-1a",
+                            Map.of(Public, ZoneId.from("prod", "aws-eu-west-1a")), true),
 
-    public static final JobType productionAwsUsWest2a= of("production-aws-us-west-2a",
+    productionAwsUsWest2a  ("production-aws-us-west-2a",
                             Map.of(main,   ZoneId.from("prod", "aws-us-west-2a"),
-                                   Public, ZoneId.from("prod", "aws-us-west-2a")));
+                                   Public, ZoneId.from("prod", "aws-us-west-2a"))),
 
-    public static final JobType testAwsUsWest2a    = of("test-aws-us-west-2a",
+    testAwsUsWest2a        ("test-aws-us-west-2a",
                             Map.of(main,   ZoneId.from("prod", "aws-us-west-2a"),
-                                   Public, ZoneId.from("prod", "aws-us-west-2a")), true);
+                                   Public, ZoneId.from("prod", "aws-us-west-2a")), true),
 
-    public static final JobType productionAwsUsEast1b= of("production-aws-us-east-1b",
-                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1b")));
+    productionAwsUsEast1b  ("production-aws-us-east-1b",
+                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1b"))),
 
-    public static final JobType testAwsUsEast1b    = of("test-aws-us-east-1b",
-                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1b")), true);
+    testAwsUsEast1b        ("test-aws-us-east-1b",
+                            Map.of(main, ZoneId.from("prod"   , "aws-us-east-1b")), true),
 
-    public static final JobType devUsEast1         = of("dev-us-east-1",
-                            Map.of(main, ZoneId.from("dev"    , "us-east-1")));
+    devUsEast1             ("dev-us-east-1",
+                            Map.of(main, ZoneId.from("dev"    , "us-east-1"))),
 
-    public static final JobType devAwsUsEast2a     = of("dev-aws-us-east-2a",
-                            Map.of(main, ZoneId.from("dev"    , "aws-us-east-2a")));
+    devAwsUsEast2a         ("dev-aws-us-east-2a",
+                            Map.of(main, ZoneId.from("dev"    , "aws-us-east-2a"))),
 
-    public static final JobType productionCdAwsUsEast1a = of("production-cd-aws-us-east-1a",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-aws-us-east-1a")));
+    productionCdAwsUsEast1a("production-cd-aws-us-east-1a",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-aws-us-east-1a"))),
 
-    public static final JobType testCdAwsUsEast1a  = of("test-cd-aws-us-east-1a",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-aws-us-east-1a")), true);
+    testCdAwsUsEast1a      ("test-cd-aws-us-east-1a",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-aws-us-east-1a")), true),
 
-    public static final JobType productionCdUsCentral1  = of("production-cd-us-central-1",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-1")));
+    productionCdUsCentral1 ("production-cd-us-central-1",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-1"))),
 
-    public static final JobType testCdUsCentral1   = of("test-cd-us-central-1",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-1")), true);
+    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
-    public static final JobType productionCdUsCentral2  = of("production-cd-us-central-2",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-2")));
+    productionCdUsCentral2 ("production-cd-us-central-2",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-2"))),
 
-    public static final JobType testCdUsCentral2   = of("test-cd-us-central-2",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-2")), true);
+    testCdUsCentral2       ("test-cd-us-central-2",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-central-2")), true),
 
-    public static final JobType productionCdUsEast1= of("production-cd-us-east-1",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-east-1")));
+    productionCdUsEast1    ("production-cd-us-east-1",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-east-1"))),
 
-    public static final JobType testCdUsEast1      = of("test-cd-us-east-1",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-east-1")), true);
+    testCdUsEast1          ("test-cd-us-east-1",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-east-1")), true),
 
-    public static final JobType productionCdUsWest1= of("production-cd-us-west-1",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-west-1")));
+    productionCdUsWest1    ("production-cd-us-west-1",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-west-1"))),
 
-    public static final JobType testCdUsWest1      = of("test-cd-us-west-1",
-                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-west-1")), true);
+    testCdUsWest1          ("test-cd-us-west-1",
+                            Map.of(cd  , ZoneId.from("prod"   , "cd-us-west-1")), true),
 
-    public static final JobType devCdUsCentral1    = of("dev-cd-us-central-1",
-                            Map.of(cd  , ZoneId.from("dev"    , "cd-us-central-1")));
+    devCdUsCentral1        ("dev-cd-us-central-1",
+                            Map.of(cd  , ZoneId.from("dev"    , "cd-us-central-1"))),
 
-    public static final JobType devCdUsWest1       = of("dev-cd-us-west-1",
-                            Map.of(cd  , ZoneId.from("dev"    , "cd-us-west-1")));
+    devCdUsWest1           ("dev-cd-us-west-1",
+                            Map.of(cd  , ZoneId.from("dev"    , "cd-us-west-1"))),
 
-    public static final JobType devAwsUsEast1c     = of("dev-aws-us-east-1c",
+    devAwsUsEast1c         ("dev-aws-us-east-1c",
                             Map.of(Public,   ZoneId.from("dev", "aws-us-east-1c"),
-                                   PublicCd, ZoneId.from("dev", "aws-us-east-1c")));
+                                   PublicCd, ZoneId.from("dev", "aws-us-east-1c"))),
 
-    public static final JobType perfAwsUsEast1c     = of("perf-aws-us-east-1c",
-                            Map.of(Public,   ZoneId.from("perf", "aws-us-east-1c")));
+    perfAwsUsEast1c         ("perf-aws-us-east-1c",
+                            Map.of(Public,   ZoneId.from("perf", "aws-us-east-1c"))),
 
-    public static final JobType perfUsEast3        = of("perf-us-east-3",
+    perfUsEast3            ("perf-us-east-3",
                             Map.of(main, ZoneId.from("perf"   , "us-east-3")));
 
-    private static final JobType[] values = new JobType[] {
-            systemTest,
-            stagingTest,
-            productionUsEast3,
-            testUsEast3,
-            productionUsWest1,
-            testUsWest1,
-            productionUsCentral1,
-            testUsCentral1,
-            productionApNortheast1,
-            testApNortheast1,
-            productionApNortheast2,
-            testApNortheast2,
-            productionApSoutheast1,
-            testApSoutheast1,
-            productionEuWest1,
-            testEuWest1,
-            productionAwsUsEast1a,
-            testAwsUsEast1a,
-            productionAwsUsEast1c,
-            testAwsUsEast1c,
-            productionAwsApNortheast1a,
-            testAwsApNortheast1a,
-            productionAwsEuWest1a,
-            testAwsEuWest1a,
-            productionAwsUsWest2a,
-            testAwsUsWest2a,
-            productionAwsUsEast1b,
-            testAwsUsEast1b,
-            devUsEast1,
-            devAwsUsEast2a,
-            productionCdAwsUsEast1a,
-            testCdAwsUsEast1a,
-            productionCdUsCentral1,
-            testCdUsCentral1,
-            productionCdUsCentral2,
-            testCdUsCentral2,
-            productionCdUsEast1,
-            testCdUsEast1,
-            productionCdUsWest1,
-            testCdUsWest1,
-            devCdUsCentral1,
-            devCdUsWest1,
-            devAwsUsEast1c,
-            perfAwsUsEast1c,
-            perfUsEast3
-    };
-
     private final String jobName;
     final Map<SystemName, ZoneId> zones;
     private final boolean isProductionTest;
 
-    private JobType(String jobName, Map<SystemName, ZoneId> zones, boolean isProductionTest) {
+    JobType(String jobName, Map<SystemName, ZoneId> zones, boolean isProductionTest) {
         if (zones.values().stream().map(ZoneId::environment).distinct().count() > 1)
             throw new IllegalArgumentException("All zones of a job must be in the same environment");
 
@@ -237,12 +180,8 @@ public final class JobType implements Comparable<JobType> {
         this.isProductionTest = isProductionTest;
     }
 
-    private static JobType of(String jobName, Map<SystemName, ZoneId> zones, boolean isProductionTest) {
-        return new JobType(jobName, zones, isProductionTest);
-    }
-
-    private static JobType of(String jobName, Map<SystemName, ZoneId> zones) {
-        return of(jobName, zones, false);
+    JobType(String jobName, Map<SystemName, ZoneId> zones) {
+        this(jobName, zones, false);
     }
 
     public String jobName() { return jobName; }
@@ -255,92 +194,12 @@ public final class JobType implements Comparable<JobType> {
         return zones.get(system);
     }
 
-    public static JobType systemTest(ZoneRegistry zones) {
-        return testIn(test, zones);
-    }
-
-    public static JobType stagingTest(ZoneRegistry zones){
-        return testIn(staging, zones);
-    }
-
-    private static JobType testIn(Environment environment, ZoneRegistry zones) {
-        return zones.zones().controllerUpgraded().in(environment).zones().stream().map(zone -> deploymentTo(zone.getId()))
-                    .findFirst().orElseThrow(() -> new IllegalArgumentException("no zones in " + environment + " among " + zones.zones().controllerUpgraded().zones()));
-    }
-
-    public static JobType dev(String region) {
-        return deploymentTo(ZoneId.from("dev", region));
-    }
-
-    public static JobType perf(String region) {
-        return deploymentTo(ZoneId.from("perf", region));
-    }
-
-    public static JobType prod(String region) {
-        return deploymentTo(ZoneId.from("prod", region));
-    }
-
-    public static JobType test(String region) {
-        return productionTestOf(ZoneId.from("prod", region));
-    }
-
-    public static JobType deploymentTo(ZoneId zone) {
-        String name;
-        switch (zone.environment()) {
-            case prod: name = "production-" + zone.region().value(); break;
-            case test: name = "system-test"; break;
-            case staging: name = "staging-test"; break;
-            default: name = zone.environment().value() + "-" + zone.region().value();
-        }
-        return of(name, dummy(zone), false);
-    }
-
-    public static JobType productionTestOf(ZoneId zone) {
-        return of("test-" + require(zone.environment() == prod, zone, "must be prod zone").region().value(),  dummy(zone), true);
-    }
-
-    private static Map<SystemName, ZoneId> dummy(ZoneId zone) {
-        return Stream.of(SystemName.values()).collect(Collectors.toMap(Function.identity(), __ -> zone));
-    }
-
-    // TODO jonmv: use for serialisation
-    public static JobType ofSerialized(String raw) {
-        String[] parts = raw.split("\\.");
-        if (parts.length == 2) return deploymentTo(ZoneId.from(parts[0], parts[1]));
-        if (parts.length == 3 && "test".equals(parts[2])) return productionTestOf(ZoneId.from(parts[0], parts[1]));
-        throw new IllegalArgumentException("illegal serialized job type '" + raw + "'");
-    }
-
-    // TODO jonmv: use for serialisation
-    public String serialized() {
-        throw new UnsupportedOperationException();
-        // return zone.environment().value() + "." + zone.region().value() + (isProductionTest ? ".test");
-    }
-
-    public static List<JobType> allIn(ZoneRegistry zones) {
-        return Stream.of(values).filter(job -> job.zones.containsKey(zones.system())).collect(Collectors.toUnmodifiableList());
-        /*
-        return zones.zones().controllerUpgraded().zones().stream()
-                    .flatMap(zone -> zone.getEnvironment().isProduction() ? Stream.of(of(zone.getId()), ofTest(zone.getId()))
-                                                                          : Stream.of(of(zone.getId())))
-                    .collect(Collectors.toUnmodifiableList());
-        */
-    }
-
-    static JobType[] values() {
-        return Arrays.copyOf(values, values.length);
-    }
-
-    public boolean isSystemTest() {
-        return environment() == test;
-    }
-
-    public boolean isStagingTest() {
-        return environment() == staging;
+    public static List<JobType> allIn(SystemName system) {
+        return Stream.of(values()).filter(job -> job.zones.containsKey(system)).collect(Collectors.toUnmodifiableList());
     }
 
     /** Returns whether this is a production job */
-    public boolean isProduction() { return environment() == prod; }
+    public boolean isProduction() { return environment() == Environment.prod; }
 
     /** Returns whether this job runs tests */
     public boolean isTest() { return isProductionTest || environment().isTest(); }
@@ -348,20 +207,17 @@ public final class JobType implements Comparable<JobType> {
     /** Returns whether this job deploys to a zone */
     public boolean isDeployment() { return ! (isProduction() && isProductionTest); }
 
-    /** Returns the environment of this job type */
+    /** Returns the environment of this job type, or null if it does not have an environment */
     public Environment environment() {
         return zones.values().iterator().next().environment();
     }
 
-    // TODO jonmv: require zones
     public static Optional<JobType> fromOptionalJobName(String jobName) {
-        if (jobName.contains(".")) return Optional.of(ofSerialized(jobName)); // TODO jonmv: remove
-        return Stream.of(values)
+        return Stream.of(values())
                      .filter(jobType -> jobType.jobName.equals(jobName))
                      .findAny();
     }
 
-    // TODO jonmv: require zones
     public static JobType fromJobName(String jobName) {
         return fromOptionalJobName(jobName)
                 .orElseThrow(() -> new IllegalArgumentException("Unknown job name '" + jobName + "'"));
@@ -369,7 +225,7 @@ public final class JobType implements Comparable<JobType> {
 
     /** Returns the job type for the given zone */
     public static Optional<JobType> from(SystemName system, ZoneId zone, boolean isTest) {
-        return Stream.of(values)
+        return Stream.of(values())
                      .filter(job -> zone.equals(job.zones.get(system)) && job.isTest() == isTest)
                      .findAny();
     }
@@ -381,7 +237,7 @@ public final class JobType implements Comparable<JobType> {
 
     /** Returns the production test job type for the given environment and region or null if none */
     public static Optional<JobType> testFrom(SystemName system, RegionName region) {
-        return from(system, ZoneId.from(prod, region), true);
+        return from(system, ZoneId.from(Environment.prod, region), true);
     }
 
     /** Returns the job job type for the given environment and region or null if none */
@@ -393,26 +249,4 @@ public final class JobType implements Comparable<JobType> {
         return from(system, ZoneId.from(environment, region));
     }
 
-
-    private static final Comparator<JobType> comparator = Comparator.comparing(JobType::environment)
-                                                                    .thenComparing(JobType::isDeployment)
-                                                                    .thenComparing(JobType::jobName);
-    @Override
-    public int compareTo(JobType other) {
-        return comparator.compare(this, other);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        JobType jobType = (JobType) o;
-        return jobName.equals(jobType.jobName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(jobName);
-    }
-
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RevisionId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RevisionId.java
index 08d800ce26d..2ab419b5388 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RevisionId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RevisionId.java
@@ -57,7 +57,7 @@ public class RevisionId implements Comparable<RevisionId> {
     @Override
     public String toString() {
         return isProduction() ? "build " + number
-                              : "dev build " + number + " for " + job.type().jobName() + " of " + job.application().instance();
+                              : "dev build " + number + " for " + job.type() + " of " + job.application().instance();
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
index b4d9dd49880..9d6fe07e91c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.api.integration.deployment;
 
 import ai.vespa.http.DomainName;
-import com.yahoo.config.provision.Environment;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.integration.LogEntry;
 
@@ -79,8 +78,8 @@ public interface TesterCloud {
         production;
 
         public static Suite of(JobType type, boolean isSetup) {
-            if (type.isSystemTest()) return system;
-            if (type.isStagingTest()) return isSetup ? staging_setup : staging;
+            if (type == JobType.systemTest) return system;
+            if (type == JobType.stagingTest) return isSetup ? staging_setup : staging;
             if (type.isProduction()) return production;
             throw new AssertionError("Unknown JobType '" + type + "'!");
         }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentFailureMails.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentFailureMails.java
index b35bf7c68c2..54c4905eb46 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentFailureMails.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentFailureMails.java
@@ -71,9 +71,9 @@ public class DeploymentFailureMails {
     }
 
     private String jobToString(JobType type) {
-        if (type.isSystemTest())
+        if (type == JobType.systemTest)
             return "System test";
-        if (type.isStagingTest())
+        if (type == JobType.stagingTest)
             return "Staging test";
         return (type.isDeployment() ? "Deployment to " : "Verification test of ") +
                type.zone(registry.system()).region();