diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-09-12 09:45:28 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-09-12 10:35:19 +0200 |
commit | 1fdbb7e82aaf8be2ac204171bec544e3cea200e9 (patch) | |
tree | 0e41e38f001d1a93d6f74751e09f16be5376e2e2 | |
parent | fad3be61c6b8e3f23700c937145c2b7a8aaecda3 (diff) |
Skip system with invalid packages
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java | 6 |
1 files changed, 5 insertions, 1 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 993bf7fee19..9a84cd7304d 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 @@ -6,6 +6,7 @@ import com.yahoo.component.Version; import com.yahoo.component.VersionCompatibility; import com.yahoo.concurrent.UncheckedTimeoutException; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.transaction.Mutex; import com.yahoo.vespa.hosted.controller.Application; @@ -702,7 +703,10 @@ public class JobController { controller.applications().lockApplicationOrThrow(TenantAndApplicationId.from(id), application -> { if ( ! application.get().instances().containsKey(id.instance())) application = controller.applications().withNewInstance(application, id); - controller.applications().validatePackage(applicationPackage, application.get()); + // TODO(mpolden): Enable for public CD once all tests have been updated + if (controller.system() != SystemName.PublicCd) { + controller.applications().validatePackage(applicationPackage, application.get()); + } controller.applications().store(application); }); |