Put devJobs inside runs array like for jobs

2 files changed, 22 insertions, 18 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 b41598f021c..b34ea79c670 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
@@ -141,7 +141,7 @@ class JobControllerApiHandlerHelper {
                 && type.environment().isManuallyDeployed()
                 && application.deployments().containsKey(type.zone(controller.system())))
                 controller.jobController().last(application.id(), type)
-                          .ifPresent(last -> runToSlime(devJobsObject.setObject(type.jobName()),
+                          .ifPresent(last -> runToSlime(devJobsObject.setObject(type.jobName()).setArray("runs").addObject(),
                                                         last,
                                                         baseUriForJobs.resolve(baseUriForJobs.getPath() + "/" + type.jobName()).normalize()));
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-overview.json
index 3f526c27221..93b6138d987 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-overview.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-overview.json
@@ -5,23 +5,27 @@
   "jobs": {},
   "devJobs": {
     "dev-us-east-1": {
-      "id": 1,
-      "status": "success",
-      "start": 0,
-      "end": 0,
-      "wantedPlatform": "6.1",
-      "wantedApplication": {
-        "hash": "unknown"
-      },
-      "steps": {
-        "deployReal": "succeeded",
-        "installReal": "succeeded"
-      },
-      "tasks": {
-        "deploy": "succeeded",
-        "install": "succeeded"
-      },
-      "log": "https://some.url:43/root/dev-us-east-1/run/1"
+      "runs": [
+        {
+          "id": 1,
+          "status": "success",
+          "start": 0,
+          "end": 0,
+          "wantedPlatform": "6.1",
+          "wantedApplication": {
+            "hash": "unknown"
+          },
+          "steps": {
+            "deployReal": "succeeded",
+            "installReal": "succeeded"
+          },
+          "tasks": {
+            "deploy": "succeeded",
+            "install": "succeeded"
+          },
+          "log": "https://some.url:43/root/dev-us-east-1/run/1"
+        }
+      ]
     }
   }
 }