diff options
3 files changed, 3 insertions, 3 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java index b48deb19f12..44c6b709cee 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java @@ -40,7 +40,7 @@ public class ZoneId { return new ZoneId(environment, region); } - public static ZoneId from(Environment environment, RegionName region, SystemName system) { + public static ZoneId from(SystemName system, Environment environment, RegionName region) { return new ZoneId(environment, region, CloudName.defaultName(), system); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java index a96ebf7dd5b..83f8412f66b 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java @@ -29,7 +29,7 @@ public class ZoneIdTest { assertEquals(CloudName.defaultName(), zoneId.cloud()); assertEquals(SystemName.defaultSystem(), zoneId.system()); - ZoneId zoneIdWithSystem = ZoneId.from(environment, region, system); + ZoneId zoneIdWithSystem = ZoneId.from(system, environment, region); assertEquals(region, zoneIdWithSystem.region()); assertEquals(environment, zoneIdWithSystem.environment()); assertEquals(CloudName.defaultName(), zoneIdWithSystem.cloud()); 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 63311a6d0af..5cfbe7d3df7 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 @@ -155,7 +155,7 @@ public enum JobType { case test: return Optional.of(systemTest); case staging: return Optional.of(stagingTest); } - return from(system, ZoneId.from(environment, region)); + return from(system, ZoneId.from(system, environment, region)); } } |