From b1ae4c3e8e2a966d5be5579f442953946ace1dd5 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Tue, 18 Dec 2018 08:47:40 +0100 Subject: Remove corp job --- .../vespa/hosted/controller/api/integration/deployment/JobType.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'controller-api') 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 e5f34f3721a..5a4086f9abb 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 @@ -16,8 +16,6 @@ public enum JobType { component ("component" , null , null ), systemTest ("system-test" , ZoneId.from("test" , "us-east-1") , ZoneId.from("test" , "cd-us-central-1") ), stagingTest ("staging-test" , ZoneId.from("staging", "us-east-3") , ZoneId.from("staging", "cd-us-central-1") ), - // TODO: Remove after corp zone disappears - productionCorpUsEast1 ("production-corp-us-east-1" , ZoneId.from("prod" , "corp-us-east-1") , null ), productionUsEast3 ("production-us-east-3" , ZoneId.from("prod" , "us-east-3") , null ), productionUsWest1 ("production-us-west-1" , ZoneId.from("prod" , "us-west-1") , null ), productionUsCentral1 ("production-us-central-1" , ZoneId.from("prod" , "us-central-1") , null ), @@ -48,7 +46,7 @@ public enum JobType { /** Returns the zone for this job in the given system, or throws if this job does not have a zone */ public ZoneId zone(SystemName system) { if ( ! zones.containsKey(system)) - throw new AssertionError(this + " does not have any zones in " + system + "."); + throw new IllegalArgumentException(this + " does not have any zones in " + system); return zones.get(system); } -- cgit v1.2.3