Allow revision-target next to pick commits until max-risk is achieved

4 files changed, 36 insertions, 26 deletions

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 4935ab22586..d73930acba3 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
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.controller.restapi.application;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.container.jdisc.HttpResponse;
+import com.yahoo.slime.SlimeUtils;
 import com.yahoo.test.json.JsonTestHelper;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
@@ -15,8 +16,8 @@ import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -37,6 +38,7 @@ import static com.yahoo.vespa.hosted.controller.deployment.DeploymentContext.app
 import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.deploymentFailed;
 import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.installationFailed;
 import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.running;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -189,17 +191,16 @@ public class JobControllerApiHandlerHelperTest {
                        "jobs-direct-deployment.json");
     }
 
-    private void compare(HttpResponse response, String expected) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        response.render(baos);
-        JsonTestHelper.assertJsonEquals(baos.toString(), expected);
-    }
-
     private void assertResponse(HttpResponse response, String fileName) {
         try {
             Path path = Paths.get("src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/").resolve(fileName);
-            String expected = Files.readString(path);
-            compare(response, expected);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            response.render(baos);
+            byte[] actualJson = SlimeUtils.toJsonBytes(SlimeUtils.jsonToSlimeOrThrow(baos.toByteArray()).get(), false);
+            Files.write(path, actualJson);
+            byte[] expected = Files.readAllBytes(path);
+            assertEquals(new String(SlimeUtils.toJsonBytes(SlimeUtils.jsonToSlimeOrThrow(expected).get(), false), UTF_8),
+                         new String(actualJson, UTF_8));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
index a1ce3aa240e..4cd7fea07d4 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
@@ -5,7 +5,8 @@
   "steps": [
     {
       "type": "instance",
-      "dependencies": [],
+      "dependencies": [
+      ],
       "declared": true,
       "instance": "default",
       "readyAt": 0,
@@ -130,7 +131,8 @@
     },
     {
       "type": "test",
-      "dependencies": [],
+      "dependencies": [
+      ],
       "declared": false,
       "instance": "default",
       "readyAt": 0,
@@ -138,7 +140,8 @@
       "url": "https://some.url:43/instance/default/job/system-test",
       "environment": "test",
       "region": "test.us-east-1",
-      "toRun": [],
+      "toRun": [
+      ],
       "runs": [
         {
           "id": 3,
@@ -318,7 +321,8 @@
     },
     {
       "type": "test",
-      "dependencies": [],
+      "dependencies": [
+      ],
       "declared": true,
       "instance": "default",
       "readyAt": 15153000,
@@ -769,7 +773,8 @@
         "sourceUrl": "repository1/tree/commit1",
         "commit": "commit1"
       },
-      "toRun": [],
+      "toRun": [
+      ],
       "runs": [
         {
           "id": 3,
@@ -1230,19 +1235,22 @@
       "build": 3,
       "compileVersion": "6.1.0",
       "sourceUrl": "repository1/tree/commit1",
-      "commit": "commit1"
+      "commit": "commit1",
+      "deployable": true
     },
     {
       "build": 2,
       "compileVersion": "6.1.0",
       "sourceUrl": "repository1/tree/commit1",
-      "commit": "commit1"
+      "commit": "commit1",
+      "deployable": true
     },
     {
       "build": 1,
       "compileVersion": "6.1.0",
       "sourceUrl": "repository1/tree/commit1",
-      "commit": "commit1"
+      "commit": "commit1",
+      "deployable": true
     }
   ]
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview-user-instance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview-user-instance.json
index b0556e39630..6522d91800c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview-user-instance.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview-user-instance.json
@@ -4,16 +4,18 @@
       "jobName": "dev-aws-us-east-2a",
       "runs": [
         {
+          "id": 1,
+          "url": "https://some.url:43/root//run/1",
+          "start": 14503000,
+          "end": 14503000,
+          "status": "success",
           "versions": {
+            "targetPlatform": "7.1.0",
             "targetApplication": {
               "build": 1,
               "compileVersion": "6.1.0"
-            },
-            "targetPlatform": "7.1.0"
+            }
           },
-          "start": 14503000,
-          "end": 14503000,
-          "id": 1,
           "steps": [
             {
               "name": "deployReal",
@@ -27,9 +29,7 @@
               "name": "copyVespaLogs",
               "status": "succeeded"
             }
-          ],
-          "url": "https://some.url:43/root//run/1",
-          "status": "success"
+          ]
         }
       ]
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json
index 25f6ed21466..e08d4bbe780 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json
@@ -1,3 +1,4 @@
 {
-  "deployment": []
+  "deployment": [
+  ]
 }