Stash with partial multile job types

2 files changed, 35 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
index 7578c133fc6..996076b81c2 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
@@ -11,8 +11,10 @@ import com.yahoo.config.application.api.DeploymentSpec.DeclaredTest;
 import com.yahoo.config.application.api.DeploymentSpec.DeclaredZone;
 import com.yahoo.config.application.api.DeploymentSpec.UpgradeRollout;
 import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.CloudName;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.stream.CustomCollectors;
 import com.yahoo.vespa.hosted.controller.Application;
@@ -86,8 +88,8 @@ public class DeploymentStatus {
                             Version systemVersion, Function<InstanceName, VersionCompatibility> versionCompatibility, Instant now) {
         this.application = requireNonNull(application);
         this.zones = zones;
-        this.systemTest = JobType.systemTest(zones);
-        this.stagingTest = JobType.stagingTest(zones);
+        this.systemTest = JobType.systemTest(zones, null);
+        this.stagingTest = JobType.stagingTest(zones, null);
         this.versionStatus = requireNonNull(versionStatus);
         this.systemVersion = requireNonNull(systemVersion);
         this.versionCompatibility = versionCompatibility;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index 67ddc767b39..63ab0e32bf9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -1,24 +1,33 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.deployment;
 
+import ai.vespa.cloud.Environment;
 import com.yahoo.component.Version;
+import com.yahoo.config.provision.CloudName;
 import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.SystemName;
+import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.Instance;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobId;
+import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RevisionId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
 import com.yahoo.vespa.hosted.controller.application.Change;
 import com.yahoo.vespa.hosted.controller.application.Deployment;
 import com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPackage;
+import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock;
+import com.yahoo.vespa.hosted.controller.integration.ZoneRegistryMock;
 import com.yahoo.vespa.hosted.controller.versions.VespaVersion;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -2287,4 +2296,26 @@ public class DeploymentTriggerTest {
         assertTrue(tester.jobs().last(app.instanceId(), stagingTest).get().hasSucceeded());
     }
 
+    @Test
+    public void testJobNames() {
+        ZoneRegistryMock zones = new ZoneRegistryMock(SystemName.main);
+        List<ZoneApi> existing = new ArrayList<>(zones.zones().all().zones());
+        existing.add(ZoneApiMock.newBuilder().withCloud("pink-clouds").withId("test.zone").build());
+        zones.setZones(existing);
+
+        JobType systemTest = JobType.systemTest(zones, CloudName.defaultName());
+        JobType pinkSystemTest = JobType.systemTest(zones, CloudName.from("pink-clouds"));
+
+        assertEquals(systemTest, JobType.systemTest(zones, null));
+        assertEquals(systemTest, JobType.systemTest(zones, CloudName.from("dark-clouds")));
+
+        assertEquals(systemTest, JobType.fromJobName("system-test", zones));
+        assertEquals(systemTest, JobType.fromJobName("system-test-default", zones));
+        assertEquals(systemTest, JobType.fromJobName("system-test-dark-clouds", zones));
+        assertEquals(pinkSystemTest, JobType.fromJobName("system-test-pink-clouds", zones));
+
+        assertEquals(ZoneId.from("test", "us-east-1"), systemTest.zone());
+        assertEquals(ZoneId.from("staging", "us-east-3"), JobType.stagingTest(zones, null).zone());
+    }
+
 }