diff options
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java')
| -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 cc1263531df..6b8ecc95cd9 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 @@ -176,10 +176,12 @@ public class DeploymentStatus { if (allowOutdatedPlatform) return augmented; + // If compatibility platform is present, require that jobs have previously been run on that platform's major. + // If platform is not present, app is already on the (old) platform iff. it has production deployments. boolean alreadyDeployedOnPlatform = augmented.platform().map(platform -> allJobs.production().asList().stream() .anyMatch(job -> job.runs().values().stream() .anyMatch(run -> run.versions().targetPlatform().getMajor() == platform.getMajor()))) - .orElse(false); + .orElse( ! application.productionDeployments().values().stream().allMatch(List::isEmpty)); // Verify target platform is either current, or was previously deployed for this app. if (augmented.platform().isPresent() && ! versionStatus.isOnCurrentMajor(augmented.platform().get()) && ! alreadyDeployedOnPlatform) |