Compare against target versions for the other production job, not this one

2 files changed, 7 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
index 8fbba05ccbc..4adea3383c5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
@@ -257,7 +257,11 @@ class JobControllerApiHandlerHelper {
                         break;
                     for (JobType stepType : steps.toJobs(step)) {
                         if (pendingProduction.containsKey(stepType)) {
-                            pendingObject.setString(shortNameOf(stepType, controller.system()), statusOf(controller, application.id(), stepType, versions));
+                            Versions jobVersions = Versions.from(application.changeAt(controller.clock().instant()),
+                                                                 application,
+                                                                 Optional.ofNullable(application.deployments().get(stepType.zone(controller.system()))),
+                                                                 controller.systemVersion());
+                            pendingObject.setString(shortNameOf(stepType, controller.system()), statusOf(controller, application.id(), stepType, jobVersions));
                             if (++pending == 3)
                                 break steps;
                         }
@@ -279,7 +283,7 @@ class JobControllerApiHandlerHelper {
     private static String statusOf(Controller controller, ApplicationId id, JobType type, Versions versions) {
         return controller.jobController().last(id, type)
                          .filter(run -> run.versions().targetsMatch(versions))
-                         .filter(run -> type == systemTest || run.versions().sourcesMatchIfPresent(versions))
+                         .filter(run -> type != stagingTest || run.versions().sourcesMatchIfPresent(versions))
                          .map(JobControllerApiHandlerHelper::taskStatusOf)
                          .orElse("pending");
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
index f6b33940929..4c8cf0e7784 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
@@ -101,7 +101,7 @@ public class JobControllerApiHandlerHelperTest {
         tester.tester().upgradeSystem(platform);
 
         // us-central-1 has started, deployed, and is installing. Deployment is not yet verified.
-        // us-east-3 is pending the failed staging test, while us-east-3 is pending us-central-1.
+        // us-east-3 is waiting for the failed staging test and us-central-1, while us-west-1 is waiting only for us-central-1.
         // Only us-east-3 is verified, on revision1.
         // staging-test has 4 runs: one success without sources on revision1, one success from revision1 to revision2,
         // one success from revision2 to revision3 and one failure from revision1 to revision3.