Ensure operators may force downgrade to unknown version

2 files changed, 31 insertions, 3 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index 8ddd0ef2be3..7909651716a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -351,9 +351,10 @@ public class ApplicationPackageBuilder {
     }
 
     private static byte[] buildMeta(Version compileVersion) {
-        return ("{\"compileVersion\":\"" + compileVersion.toFullString() +
-                "\",\"buildTime\":1000,\"parentVersion\":\"" +
-                compileVersion.toFullString() + "\"}").getBytes(UTF_8);
+        return compileVersion == null ? new byte[0]
+                                      : ("{\"compileVersion\":\"" + compileVersion.toFullString() +
+                                         "\",\"buildTime\":1000,\"parentVersion\":\"" +
+                                         compileVersion.toFullString() + "\"}").getBytes(UTF_8);
     }
 
     public ApplicationPackage build() {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index f7d74373ac7..d8cef45f124 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -2352,6 +2352,33 @@ public class DeploymentTriggerTest {
     }
 
     @Test
+    void operatorMayForceUnknownVersion() {
+        Version oldVersion = Version.fromString("6");
+        Version currentVersion = Version.fromString("7");
+        tester.controllerTester().flagSource().withListFlag(PermanentFlags.INCOMPATIBLE_VERSIONS.id(), List.of("7"), String.class);
+        tester.controllerTester().upgradeSystem(currentVersion);
+        assertEquals(List.of(currentVersion),
+                     tester.controller().readVersionStatus().versions().stream().map(VespaVersion::versionNumber).toList());
+
+        DeploymentContext app = tester.newDeploymentContext();
+        assertEquals("compile version 6 is incompatible with the current major version of this system",
+                     assertThrows(IllegalArgumentException.class,
+                                  () -> app.submit(new ApplicationPackageBuilder().region("us-east-3")
+                                                                                  .majorVersion(6)
+                                                                                  .compileVersion(oldVersion)
+                                                                                  .build()))
+                             .getMessage());
+
+        tester.deploymentTrigger().forceChange(app.instanceId(), Change.of(oldVersion).with(app.application().revisions().last().get().id()).withPin());
+        app.deploy();
+        assertEquals(oldVersion, app.deployment(ZoneId.from("prod", "us-east-3")).version());
+
+        tester.controllerTester().computeVersionStatus();
+        assertEquals(List.of(oldVersion, currentVersion),
+                     tester.controller().readVersionStatus().versions().stream().map(VespaVersion::versionNumber).toList());
+    }
+
+    @Test
     void testInitialDeploymentPlatform() {
         Version version0 = tester.controllerTester().controller().readSystemVersion();
         Version version1 = new Version("6.2");