Use target version (which is compatible with compiled package) for testers if otherwise incompatible

1 files changed, 4 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 632eb556444..3105adb2488 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -409,9 +409,10 @@ public class InternalStepRunner implements StepRunner {
     }
 
     private Version testerPlatformVersion(RunId id) {
-        return application(id.application()).change().isPinned()
-               ? controller.jobController().run(id).get().versions().targetPlatform()
-               : controller.readSystemVersion();
+        Version targetPlatform = controller.jobController().run(id).get().versions().targetPlatform();
+        Version systemVersion = controller.readSystemVersion();
+        boolean incompatible = controller.applications().versionCompatibility(id.application()).refuse(targetPlatform, systemVersion);
+        return incompatible || application(id.application()).change().isPinned() ? targetPlatform : systemVersion;
     }
 
     private Optional<RunStatus> installTester(RunId id, DualLogger logger) {