diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-01-17 22:05:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-17 22:05:01 +0100 |
| commit | 2887ecd300b555301ababd56cebd278e0fcd8283 (patch) | |
| tree | 4bcbf612109f64c3ff1ddca01ae3441d5b237e24 /controller-server | |
| parent | e952ea8f8782ec0a177a7c043f25b3928396654d (diff) | |
| parent | 2bb43e8a161034cb8b94f2a843323981e5c9a768 (diff) | |
Merge pull request #11844 from vespa-engine/jvenstad/staging-testup
Run testers on system version
Diffstat (limited to 'controller-server')
2 files changed, 3 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 115b53e36df..bd61d85fbc0 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 @@ -187,7 +187,7 @@ public class InternalStepRunner implements StepRunner { } private Optional<RunStatus> deployTester(RunId id, DualLogger logger) { - Version platform = controller.jobController().run(id).get().versions().targetPlatform(); + Version platform = controller.systemVersion(); logger.log("Deploying the tester container on platform " + platform + " ..."); return deploy(id.tester().id(), id.type(), @@ -312,7 +312,7 @@ public class InternalStepRunner implements StepRunner { private Optional<RunStatus> installTester(RunId id, DualLogger logger) { Run run = controller.jobController().run(id).get(); - Version platform = run.versions().targetPlatform(); + Version platform = controller.systemVersion(); logger.log("Checking installation of tester container ..."); if ( nodesConverged(id.tester().id(), id.type(), platform, logger) && servicesConverged(id.tester().id(), id.type(), platform, logger)) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java index cac29cc7612..bd3dc5d4336 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java @@ -506,7 +506,7 @@ public class DeploymentContext { ZoneId zone = zone(job); assertEquals(unfinished, jobs.run(id).get().stepStatuses().get(Step.installTester)); - configServer().nodeRepository().doUpgrade(new DeploymentId(TesterId.of(job.application()).id(), zone), Optional.empty(), currentRun(job).versions().targetPlatform()); + configServer().nodeRepository().doUpgrade(new DeploymentId(TesterId.of(job.application()).id(), zone), Optional.empty(), tester.controller().systemVersion()); runner.advance(currentRun(job)); assertEquals(unfinished, jobs.run(id).get().stepStatuses().get(Step.installTester)); configServer().convergeServices(TesterId.of(id.application()).id(), zone); |