summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-11-29 08:26:31 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-11-29 08:26:31 +0100
commit684688979c2fd527aa4f44b172fbc96c9ceaa012 (patch)
tree1e64bc6c195de7574c542ca55b59a5b864a62c1b /controller-server
parent5241caec06fb11171ac2a0a0756f85a225687a4c (diff)
Get version information from a better source >_<
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java7
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(),