FIlter out broken confidence versions for compile version

8 files changed, 17 insertions, 6 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java
index 0ecb7ae13cc..be1deb3997a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java
@@ -19,6 +19,7 @@ public class MockMavenRepository implements MavenRepository {
     @Override
     public Metadata metadata() {
         return new Metadata(id, List.of(Version.fromString("6.0"),
+                                        Version.fromString("6.1"),
                                         Version.fromString("6.2")));
     }
 
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 79684e705b1..9f091061596 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
@@ -105,6 +105,7 @@ import java.util.Scanner;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.joining;
 
@@ -695,7 +696,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     }
 
     /**
-     * Returns a version at least as old as the oldest platform the given application is on, and which is released.
+     * Returns a non-broken, released version at least as old as the oldest platform the given application is on.
      *
      * If no known version is applicable, the newest version at least as old as the oldest platform is selected,
      * among all versions released for this system. If no such versions exists, throws an IllegalStateException.
@@ -703,12 +704,16 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     private Version compileVersion(ApplicationId id) {
         Version oldestPlatform = controller.applications().oldestInstalledPlatform(id);
         return controller.versionStatus().versions().stream()
+                         .filter(version -> version.confidence().equalOrHigherThan(VespaVersion.Confidence.low))
                          .filter(VespaVersion::isReleased)
                          .map(VespaVersion::versionNumber)
                          .filter(version -> ! version.isAfter(oldestPlatform))
                          .max(Comparator.naturalOrder())
                          .orElseGet(() -> controller.mavenRepository().metadata().versions().stream()
                                                     .filter(version -> ! version.isAfter(oldestPlatform))
+                                                    .filter(version -> ! controller.versionStatus().versions().stream()
+                                                                                   .map(VespaVersion::versionNumber)
+                                                                                   .collect(Collectors.toSet()).contains(version))
                                                     .max(Comparator.naturalOrder())
                                                     .orElseThrow(() -> new IllegalStateException("No available releases of " +
                                                                                                  controller.mavenRepository().artifactId())));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
index 76c505ff8f8..427428a3a94 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
@@ -54,7 +54,7 @@ public class ContainerControllerTester {
 
     public ContainerControllerTester(JDisc container, String responseFilePath) {
         containerTester = new ContainerTester(container, responseFilePath);
-        CuratorDb curatorDb = new MockCuratorDb();
+        CuratorDb curatorDb = controller().curator();
         curatorDb.writeUpgradesPerMinute(100);
         upgrader = new Upgrader(controller(), Duration.ofDays(1), new JobControl(curatorDb), curatorDb);
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 71c4b41a276..16fd10277d2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -61,6 +61,8 @@ import com.yahoo.vespa.hosted.controller.restapi.ContainerControllerTester;
 import com.yahoo.vespa.hosted.controller.restapi.ContainerTester;
 import com.yahoo.vespa.hosted.controller.restapi.ControllerContainerTest;
 import com.yahoo.vespa.hosted.controller.tenant.AthenzTenant;
+import com.yahoo.vespa.hosted.controller.versions.VersionStatus;
+import com.yahoo.vespa.hosted.controller.versions.VespaVersion;
 import com.yahoo.yolean.Exceptions;
 import org.junit.Before;
 import org.junit.Test;
@@ -369,6 +371,9 @@ public class ApplicationApiTest extends ControllerContainerTest {
                                       .oktaAccessToken(OKTA_AT),
                               "");
 
+        // Set version 6.1 to broken to change compile version for.
+        controllerTester.upgrader().overrideConfidence(Version.fromString("6.1"), VespaVersion.Confidence.broken);
+        tester.computeVersionStatus();
         setDeploymentMaintainedInfo(controllerTester);
         // GET tenant application deployments
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1", GET)
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
index 5d1819bf0f2..1d719133ac3 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
@@ -217,7 +217,7 @@
       ]
     }
   ],
-  "compileVersion": "(ignore)",
+  "compileVersion": "6.0.0",
   "globalRotations": [
     "https://application1--tenant1.global.vespa.oath.cloud:4443/"
   ],
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
index bf4ae9663f7..46f18f9d813 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
@@ -76,7 +76,7 @@
     }
   ],
   "changeBlockers": [],
-  "compileVersion": "6.0.0",
+  "compileVersion": "6.1.0",
   "majorVersion": 7,
   "globalRotations": [],
   "instances": [],
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
index 1d5a5aac089..3063bb62b7e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
@@ -76,7 +76,7 @@
     }
   ],
   "changeBlockers": [],
-  "compileVersion": "6.0.0",
+  "compileVersion": "6.1.0",
   "globalRotations": [],
   "instances": [],
   "metrics": {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java
index ba81c5cf4e4..74d637499bd 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java
@@ -80,7 +80,7 @@ public class ControllerApiTest extends ControllerContainerTest {
     public void testUpgraderApi() {
         // Get current configuration
         tester.assertResponse(authenticatedRequest("http://localhost:8080/controller/v1/jobs/upgrader", new byte[0], Request.Method.GET),
-                              "{\"upgradesPerMinute\":0.125,\"confidenceOverrides\":[]}",
+                              "{\"upgradesPerMinute\":100.0,\"confidenceOverrides\":[]}",
                               200);
 
         // Set invalid configuration