Count prod deployments as relevant (to not abort) when same targets

1 files changed, 3 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index d39e0c134fd..709064c8715 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -107,7 +107,9 @@ public class DeploymentTrigger {
                     Map<JobId, List<Versions>> newJobsToRun = jobs.deploymentStatus(application.get()).jobsToRun();
                     for (Run run : jobs.active(application.get().id().instance(instanceName))) {
                         if (   ! run.id().type().environment().isManuallyDeployed()
-                            && ! newJobsToRun.getOrDefault(run.id().job(), List.of()).contains(run.versions()))
+                            &&   newJobsToRun.getOrDefault(run.id().job(), List.of()).stream()
+                                             .noneMatch(versions ->    versions.targetsMatch(run.versions())
+                                                                    && versions.sourcesMatchIfPresent(run.versions())))
                             jobs.abort(run.id());
                     }
                 }