diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-05-26 20:45:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 20:45:31 +0200 |
| commit | 5c5a4aa50217dbb3a0ab7f5ac45e7423b01a2ec8 (patch) | |
| tree | b519fb26658273e87a7e250f07ab491a21c4c5c2 | |
| parent | eb009280c37c1dbbcc1ccaa1784f51435b71cb5d (diff) | |
| parent | 3d0b97d04bffe6431294d73ccaf9bbaeaf7a8c70 (diff) | |
Merge pull request #13380 from vespa-engine/hmusum/hardcode-tester-deployment-version-for-pinned-apps
Add hack for using same version as applications are pinned to
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 7 |
1 files changed, 6 insertions, 1 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 bc206011bb1..3e3a25dac80 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 @@ -194,7 +194,12 @@ public class InternalStepRunner implements StepRunner { } private Optional<RunStatus> deployTester(RunId id, DualLogger logger) { - Version platform = controller.systemVersion(); + Version targetPlatform = controller.jobController().run(id).get().versions().targetPlatform(); + // TODO: Hack to make sure some pinned applications get this version for tester deployments + // Remove when no applications are pinned to this version anymore + final Version platform = targetPlatform.equals(Version.fromString("7.220.14")) + ? targetPlatform + : controller.systemVersion(); logger.log("Deploying the tester container on platform " + platform + " ..."); return deploy(id.tester().id(), id.type(), |