diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-09-19 11:04:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 11:04:57 -0700 |
| commit | f8c982d634a04922decf2610b1e8aec10a7e1b61 (patch) | |
| tree | fac04bb8d104d18cfae0c9f998a310e07b1bad38 | |
| parent | 5ae62ae596c676fbc51fbae4592b32f5e4b7a5e7 (diff) | |
| parent | 75f8b7874d643ded6ba17415b25e1487375cb7b5 (diff) | |
Merge pull request #7020 from vespa-engine/jvenstad/better-compile-version-guess
Take a (good) guess at compile version for component jobs
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index 2284b82bcfb..5086cebc1cf 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -103,8 +103,8 @@ public class DeploymentTrigger { JobRun triggering; if (report.jobType() == component) { ApplicationVersion applicationVersion = ApplicationVersion.from(report.sourceRevision().get(), report.buildNumber()); - triggering = JobRun.triggering(controller.systemVersion(), applicationVersion, Optional.empty(), - Optional.empty(), "Application commit", clock.instant()); + triggering = JobRun.triggering(application.get().oldestDeployedPlatform().orElse(controller.systemVersion()), applicationVersion, + Optional.empty(), Optional.empty(), "Application commit", clock.instant()); if (report.success()) { if (acceptNewApplicationVersion(application.get())) application = application.withChange(application.get().change().with(applicationVersion)) |