diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-09-14 10:08:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-14 10:08:03 +0200 |
commit | fbae5bf8bca3c508194d3b81977922fef0f68ee4 (patch) | |
tree | 594fd74751f7fea51bf0ebb062c4b26c6eac0777 /controller-server | |
parent | 909d7138153405280abda6e9888a701f2abcca15 (diff) | |
parent | e62f0ca479d199acd61bd12d15f4916ed22be559 (diff) |
Merge pull request #19101 from vespa-engine/freva/prev-version
Set source platform and application on dev deployment upgrades
Diffstat (limited to 'controller-server')
4 files changed, 35 insertions, 4 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; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java index de5ae466039..3a9e2cf84d4 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java @@ -157,9 +157,10 @@ public class JobControllerApiHandlerHelperTest { tester.configServer().setLogStream(() -> "Nope, this won't be logged"); tester.configServer().convergeServices(app.instanceId(), zone); tester.runner().run(); + assertResponse(JobControllerApiHandlerHelper.runDetailsResponse(tester.jobs(), tester.jobs().last(app.instanceId(), devUsEast1).get().id(), "8"), "dev-us-east-1-log-second-part.json"); + tester.jobs().deploy(app.instanceId(), JobType.devUsEast1, Optional.empty(), applicationPackage()); assertResponse(JobControllerApiHandlerHelper.jobTypeResponse(tester.controller(), app.instanceId(), URI.create("https://some.url:43/root")), "dev-overview.json"); - assertResponse(JobControllerApiHandlerHelper.runDetailsResponse(tester.jobs(), tester.jobs().last(app.instanceId(), devUsEast1).get().id(), "8"), "dev-us-east-1-log-second-part.json"); } @Test diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-overview.json index 92a823bdfc2..63fd0845d1b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-overview.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-overview.json @@ -6,6 +6,36 @@ { "versions": { "targetApplication": { + "build": 2 + }, + "targetPlatform": "6.1.0", + "sourceApplication": { + "build": 1 + }, + "sourcePlatform": "6.1.0" + }, + "start": 0, + "id": 2, + "steps": [ + { + "name": "deployReal", + "status": "succeeded" + }, + { + "name": "installReal", + "status": "unfinished" + }, + { + "name": "copyVespaLogs", + "status": "unfinished" + } + ], + "url": "https://some.url:43/root/run/2", + "status": "running" + }, + { + "versions": { + "targetApplication": { "build": 1 }, "targetPlatform": "6.1.0" |