Merge pull request #20115 from vespa-engine/jonmv/dummy-dev-deployments

Add dummy deploymenst for running dev/perf deployments too

1 files changed, 11 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 5cd5a70e4a4..d9f0358e3b5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -1292,18 +1292,22 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
                                                            request.getUri()).toString());
             }
         }
-        // Add dummy values for not-yet-existent prod deployments.
-        status.jobSteps().keySet().stream()
-              .filter(job -> job.application().instance().equals(instance.name()))
-              .filter(job -> job.type().isProduction() && job.type().isDeployment())
+        // Add dummy values for not-yet-existent prod deployments, and running dev/perf deployments.
+        Stream.concat(status.jobSteps().keySet().stream()
+                            .filter(job -> job.application().instance().equals(instance.name()))
+                            .filter(job -> job.type().isProduction() && job.type().isDeployment()),
+                      controller.jobController().active(instance.id()).stream()
+                                .map(run -> run.id().job())
+                                .filter(job -> job.type().environment().isManuallyDeployed()))
               .map(job -> job.type().zone(controller.system()))
               .filter(zone -> ! instance.deployments().containsKey(zone))
               .forEach(zone -> {
-                    Cursor deploymentObject = instancesArray.addObject();
-                    deploymentObject.setString("environment", zone.environment().value());
-                    deploymentObject.setString("region", zone.region().value());
+                  Cursor deploymentObject = instancesArray.addObject();
+                  deploymentObject.setString("environment", zone.environment().value());
+                  deploymentObject.setString("region", zone.region().value());
               });
 
+
         // TODO jonmv: Remove when clients are updated
         application.deployKeys().stream().findFirst().ifPresent(key -> object.setString("pemDeployKey", KeyUtils.toPem(key)));