Merge pull request #7809 from vespa-engine/jvenstad/run-tester-on-same-version-as-deployment

Get version information from a better source >_<

1 files changed, 1 insertions, 6 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 62514ada7ce..e1ce982b75c 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
@@ -156,12 +156,7 @@ public class InternalStepRunner implements StepRunner {
     }
 
     private Optional<RunStatus> deployTester(RunId id, DualLogger logger) {
-        // TODO jvenstad: Consider deploying old version of tester for initial staging feeding?
-        Version platform = controller.applications().require(id.application())
-                .deploymentJobs().statusOf(id.type())
-                .flatMap(JobStatus::lastTriggered)
-                .map(JobStatus.JobRun::platform)
-                .orElseThrow(() -> new IllegalStateException("Should not be here without a triggering!"));
+        Version platform = controller.jobController().run(id).get().versions().targetPlatform();
         logger.log("Deploying the tester container on platform " + platform + " ...");
         return deploy(id.tester().id(),
                       id.type(),