Wait for installReal step before doing report step

2 files changed, 2 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 7c5c8d55e2a..b26e8fa5f05 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
@@ -565,8 +565,7 @@ public class JobController {
     public void locked(ApplicationId id, JobType type, Step step, Consumer<LockedStep> action) throws TimeoutException {
         try (Lock lock = curator.lock(id, type, step)) {
             for (Step prerequisite : step.prerequisites()) // Check that no prerequisite is still running.
-                try (Lock __ = curator.lock(id, type, prerequisite)) {
-                }
+                try (Lock __ = curator.lock(id, type, prerequisite)) { ; }
 
             action.accept(new LockedStep(lock, step));
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
index 75d875a29c5..17cfd1bdf1d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
@@ -65,7 +65,7 @@ public enum Step {
     deactivateTester(true, deployTester, endTests),
 
     /** Report completion to the deployment orchestration machinery. */
-    report(true, deactivateReal, deactivateTester);
+    report(true, installReal, deactivateReal, deactivateTester);
 
 
     private final boolean alwaysRun;