summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-09-15 12:38:43 +0200
committerjonmv <venstad@gmail.com>2022-09-15 12:38:43 +0200
commitce2e2cc29544e515ce9a8611c8218a5d4d91a206 (patch)
tree586ee3716a32a52cc7f68e4911bc0328fc158d8d /controller-server
parentcf27b7cec28c3d7df7cd2bd938c6253dbcbff8eb (diff)
Disable checks permanently in CD systems instead
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index ba5b9d1e62f..0d4b2c658cf 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -690,9 +690,10 @@ public class JobController {
throw new IllegalArgumentException(type.zone() + " is not present in this system");
VersionStatus versionStatus = controller.readVersionStatus();
- /* TODO jonmv: re-enable
- if (platform.isPresent() && versionStatus.deployableVersions().stream().map(VespaVersion::versionNumber).noneMatch(platform.get()::equals))
- throw new IllegalArgumentException("platform version " + platform.get() + " is not present in this system"); */
+ if ( ! controller.system().isCd()
+ && platform.isPresent()
+ && versionStatus.deployableVersions().stream().map(VespaVersion::versionNumber).noneMatch(platform.get()::equals))
+ throw new IllegalArgumentException("platform version " + platform.get() + " is not present in this system");
controller.applications().lockApplicationOrThrow(TenantAndApplicationId.from(id), application -> {
if ( ! application.get().instances().containsKey(id.instance()))