summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2022-08-29 13:55:40 +0200
committerGitHub <noreply@github.com>2022-08-29 13:55:40 +0200
commit7158f281c801c38d930b86e36fda9df50c8a2e8f (patch)
tree97cdd84878adfeba8864f8509d0208936060fd48
parent87c82aa9266205e676e0cd1524233f1d2ae6a557 (diff)
parentdcf22a9eafc3f38ad8f7082c58486eb3b64e9e16 (diff)
Merge pull request #23829 from vespa-engine/jonmv/avoid-triggering-running-dev-jobs
Avoid triggering already running dev jobs
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java
index c86f79ce188..93ef6d29450 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java
@@ -52,6 +52,7 @@ public class DeploymentUpgrader extends ControllerMaintainer {
Run last = controller().jobController().last(job).get();
Versions target = new Versions(targetPlatform, last.versions().targetRevision(), Optional.of(last.versions().targetPlatform()), Optional.of(last.versions().targetRevision()));
+ if ( ! last.hasEnded()) continue;
if (application.revisions().get(last.versions().targetRevision()).compileVersion()
.map(version -> controller().applications().versionCompatibility(instance.id()).refuse(version, target.targetPlatform()))
.orElse(false)) continue;