1 files changed, 21 insertions, 0 deletions
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 c8126207a73..eda3a092f2b 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
@@ -6,6 +6,7 @@ import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
+import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
@@ -2021,4 +2022,24 @@ public class DeploymentTriggerTest {
         List<RetriggerEntry> retriggerEntries = tester.controller().curator().readRetriggerEntries();
         Assert.assertEquals(1, retriggerEntries.size());
     }
+
+    @Test
+    public void testOrchestrationWithIncompatibleVersionPairs() {
+        Version version1 = new Version("7");
+        Version version2 = new Version("8");
+        tester.controllerTester().flagSource().withListFlag(PermanentFlags.INCOMPATIBLE_VERSIONS.id(), List.of("8"), String.class);
+
+        tester.controllerTester().upgradeSystem(version1);
+        DeploymentContext app = tester.newDeploymentContext()
+                                      .submit(new ApplicationPackageBuilder().region("us-east-3")
+                                                                             .compileVersion(version1)
+                                                                             .build())
+                                      .deploy();
+
+        app.submit(new ApplicationPackageBuilder().region("us-east-3")
+                                                  .compileVersion(version2)
+                                                  .build());
+        app.deploy();
+    }
+
 }