diff options
author | jonmv <venstad@gmail.com> | 2022-10-04 09:52:27 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-10-04 09:52:27 +0200 |
commit | b12dd64b6e54865f29966e6d96e239cd9d745c16 (patch) | |
tree | fe6fad00678726e18da8568202850cbce61a86c6 /controller-server | |
parent | 80cfe313a427ccfe96cb7d3c503b896fbfee3ed3 (diff) |
No istant retires on node allocation failures outside on-prem test zones
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java | 4 |
1 files changed, 3 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 d5a8b44a559..6542cc08f9b 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 @@ -1027,7 +1027,9 @@ public class DeploymentStatus { Versions lastVersions = job.lastCompleted().get().versions(); Versions toRun = Versions.from(change, status.application, dependent.flatMap(status::deploymentFor), status.fallbackPlatform(change, job.id())); if ( ! toRun.targetsMatch(lastVersions)) return Optional.empty(); - if (job.id().type().environment().isTest() && job.isNodeAllocationFailure()) return Optional.empty(); + if ( job.id().type().environment().isTest() + && dependent.map(JobId::type).map(status::findCloud).map(CloudName.DEFAULT::equals).orElse(false) + && job.isNodeAllocationFailure()) return Optional.empty(); Instant firstFailing = job.firstFailing().get().end().get(); Instant lastCompleted = job.lastCompleted().get().end().get(); |