Merge pull request #6935 from vespa-engine/jvenstad/misc

Correct isComplete to work also when jobs are running (and have deplo…

1 files changed, 5 insertions, 2 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 becef782519..2284b82bcfb 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
@@ -412,10 +412,13 @@ public class DeploymentTrigger {
      */
     public boolean isComplete(Change change, Application application, JobType jobType) {
         Optional<Deployment> existingDeployment = deploymentFor(application, jobType);
-        return    successOn(application, jobType, Versions.from(change, application, existingDeployment, controller.systemVersion())).isPresent()
+        return       application.deploymentJobs().statusOf(jobType).flatMap(JobStatus::lastSuccess)
+                                .map(job ->    change.platform().map(job.platform()::equals).orElse(true)
+                                            && change.application().map(job.application()::equals).orElse(true))
+                                .orElse(false)
                ||    jobType.isProduction()
                   && existingDeployment.map(deployment -> ! isUpgrade(change, deployment) && isDowngrade(application.change(), deployment))
-                                       .orElse(false);
+                                          .orElse(false);
     }
 
     private static boolean isUpgrade(Change change, Deployment deployment) {