diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-13 22:10:41 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-13 22:10:41 +0200 |
| commit | e62f0ca479d199acd61bd12d15f4916ed22be559 (patch) | |
| tree | 844ce0062d5a75a24ea3edfe15dc91a853198a96 /controller-server/src/main | |
| parent | 92ad19102e936032fe61fa5a93bc88a2fc246a22 (diff) | |
Set source platform and application on dev deployment upgrades
Diffstat (limited to 'controller-server/src/main')
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index da5282d8e93..652f8630cb6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -520,8 +520,8 @@ public class JobController { .flatMap(controller.applications()::lastCompatibleVersion) .orElseGet(controller::readSystemVersion)), version, - Optional.empty(), - Optional.empty()), + lastRun.map(run -> run.versions().targetPlatform()), + lastRun.map(run -> run.versions().targetApplication())), false, JobProfile.development); }); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java index 0039ce2320e..97e9a233f9f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentUpgrader.java @@ -44,7 +44,7 @@ public class DeploymentUpgrader extends ControllerMaintainer { if ( ! deployment.zone().environment().isManuallyDeployed()) continue; Run last = controller().jobController().last(job).get(); - Versions target = new Versions(systemVersion, last.versions().targetApplication(), Optional.empty(), Optional.empty()); + Versions target = new Versions(systemVersion, last.versions().targetApplication(), Optional.of(last.versions().targetPlatform()), Optional.of(last.versions().targetApplication())); if ( ! deployment.version().isBefore(target.targetPlatform())) continue; if ( controller().clock().instant().isBefore(last.start().plus(Duration.ofDays(1)))) continue; if ( ! isLikelyNightFor(job)) continue; |