1 files changed, 6 insertions, 27 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 038a4a56e9e..68d80d54a3c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -87,17 +87,12 @@ public class DeploymentTrigger {
             // Handle successful starting and ending
             if (report.jobType() == JobType.component) {
                 if (report.success()) {
-                    if ( ! acceptNewApplicationVersionNow(application)) {
-                        applications().store(application.withOutstandingChange(Change.of(applicationVersion)));
-                        return;
-                    }
-                    // Note that in case of an ongoing upgrade this may result in both the upgrade and application
-                    // change being deployed together
-                    application = application.withChange(application.change().with(applicationVersion));
-                }
-                else { // don't re-trigger component on failure
-                    applications().store(application);
-                    return;
+                    if ( ! acceptNewApplicationVersionNow(application))
+                        application = application.withOutstandingChange(Change.of(applicationVersion));
+                    else
+                        // Note that in case of an ongoing upgrade this may result in both the upgrade and application
+                        // change being deployed together
+                        application = application.withChange(application.change().with(applicationVersion));
                 }
             }
             else if (report.jobType().isProduction() && deploymentComplete(application)) {
@@ -106,21 +101,6 @@ public class DeploymentTrigger {
                 application = application.withChange(Change.empty());
             }
 
-            // TODO jvenstad: Don't trigger.
-            // Trigger next
-            if (report.success()) {
-                triggerReadyJobs(application);
-                return; // Don't overwrite below.
-            }
-            else if (retryBecauseOutOfCapacity(application, report.jobType())) {
-                triggerReadyJobs(application);
-                return; // Don't overwrite below.
-            }
-            else if (retryBecauseNewFailure(application, report.jobType())) {
-                triggerReadyJobs(application);
-                return; // Don't overwrite below.
-            }
-
             applications().store(application);
         });
     }
@@ -226,7 +206,6 @@ public class DeploymentTrigger {
             application = application.withChange(change);
             if (change.application().isPresent())
                 application = application.withOutstandingChange(Change.empty());
-            // TODO jvenstad: Don't trigger.
             triggerReadyJobs(application);
         });
     }