summaryrefslogtreecommitdiffstats
path: root/controller-server/src
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-11-04 10:29:37 +0100
committerJon Marius Venstad <venstad@gmail.com>2019-11-04 10:29:37 +0100
commit7d85d248c66e9789fecf60525b5968a609cc542f (patch)
tree72e04bd9407958c3ea25c0eaeeb81c5f2c888355 /controller-server/src
parent1fb8ad0c9eea7b096f85251e17a7d6b2ad3e1177 (diff)
Do not cancel change when submitting, as all apps are on internal pipeline
Diffstat (limited to 'controller-server/src')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java4
1 files changed, 1 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 c4f394d237b..cc483dff765 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
@@ -343,9 +343,7 @@ public class JobController {
controller.applications().applicationStore().put(instance.id().tenant(), instance.id().application(), appVersion, content);
});
}
- // Make sure any ongoing upgrade is cancelled, since future jobs will require the tester artifact.
- return application.withChange(application.get().change().withoutPlatform().withoutApplication())
- .withBuiltInternally(true);
+ return application.withBuiltInternally(true);
}
/** Orders a run of the given type, or throws an IllegalStateException if that job type is already running. */