diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2022-01-26 12:18:19 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2022-01-31 11:17:07 +0100 |
commit | 35c18778ea40abd3295248564b3ed27630d42661 (patch) | |
tree | 780a50f1ea8445c7e42c88eb5259e22da47cfa34 /controller-server | |
parent | 4bd4e26765074e36199ad0428bbf758d7dc29f82 (diff) |
Simpler completion checek for non-prod instances
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java | 2 |
1 files changed, 1 insertions, 1 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 05242ed744e..8b1bfc8d548 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 @@ -535,7 +535,7 @@ public class DeploymentStatus { Optional<Instant> completedAt(Change change, Optional<JobId> dependent) { return ( (change.platform().isEmpty() || change.platform().equals(instance.change().platform())) && (change.application().isEmpty() || change.application().equals(instance.change().application())) - || status.jobsToRun(Map.of(instance.name(), change)).isEmpty()) + || step().steps().stream().noneMatch(step -> step.concerns(prod))) ? dependenciesCompletedAt(change, dependent) : Optional.empty(); } |