Let JobType.allIn use provided zones

4 files changed, 16 insertions, 19 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 297cccfce84..c38d3704295 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
@@ -274,13 +274,10 @@ public final class JobType implements Comparable<JobType> {
     }
 
     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())))
+                    .flatMap(zone -> zone.getEnvironment().isProduction() ? Stream.of(deploymentTo(zone.getId()), productionTestOf(zone.getId()))
+                                                                          : Stream.of(deploymentTo(zone.getId())))
                     .collect(Collectors.toUnmodifiableList());
-        */
     }
 
     static JobType[] values() {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java
index a4221ff3564..7f2799b6f58 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java
@@ -83,7 +83,7 @@ public class CloudTrialExpirerTest {
                 .withSystem(tester.zoneRegistry().system())
                 .withId("prod." + regionName)
                 .build();
-        tester.zoneRegistry().setZones(zone);
+        tester.zoneRegistry().setZones(ZoneApiMock.fromId("test.aws-us-east-1c"), ZoneApiMock.fromId("staging.aws-us-east-1c"), zone);
         var app = tester.createApplication(tenantName, appName, instanceName);
         var ctx = deploymentTester.newDeploymentContext(tenantName, appName, instanceName);
         var pkg = new ApplicationPackageBuilder()
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
index f09b60efacc..9c34f9410ee 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
@@ -353,25 +353,21 @@
   "jobs": [
     "system-test",
     "staging-test",
-    "production-us-east-3",
-    "test-us-east-3",
-    "production-us-west-1",
-    "test-us-west-1",
-    "production-us-central-1",
-    "test-us-central-1",
+    "production-aws-us-east-1a",
+    "test-aws-us-east-1a",
     "production-ap-northeast-1",
     "test-ap-northeast-1",
     "production-ap-northeast-2",
     "test-ap-northeast-2",
     "production-ap-southeast-1",
     "test-ap-southeast-1",
+    "production-us-east-3",
+    "test-us-east-3",
+    "production-us-west-1",
+    "test-us-west-1",
+    "production-us-central-1",
+    "test-us-central-1",
     "production-eu-west-1",
-    "test-eu-west-1",
-    "production-aws-us-east-1a",
-    "test-aws-us-east-1a",
-    "production-aws-us-west-2a",
-    "test-aws-us-west-2a",
-    "production-aws-us-east-1b",
-    "test-aws-us-east-1b"
+    "test-eu-west-1"
   ]
 }
diff --git a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
index 8e3029009b0..ee0b98c00ed 100644
--- a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
+++ b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
@@ -161,6 +161,10 @@ class HttpURLTest {
         assertEquals("path segments cannot be \"\", \".\", or \"..\", but got: '..'",
                      assertThrows(IllegalArgumentException.class,
                                   () -> Path.empty().append("%2E%25252E")).getMessage());
+
+        assertEquals("path segments cannot be \"\", \".\", or \"..\", but got: ''",
+                     assertThrows(IllegalArgumentException.class,
+                                  () -> Path.parse("//")).getMessage());
     }
 
     @Test