diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-04-12 12:20:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 12:20:40 +0200 |
| commit | 33c8ae9c7535ebb0f614111ec354ecaf49a314fc (patch) | |
| tree | 6f5167af9e1fbfc3f2aaab95a00a3af2ed1262d7 | |
| parent | 57f7c0558447ae552f27b85544210a547cadcb5f (diff) | |
| parent | 04e0ae14d21968774cb724d8f940c59672807821 (diff) | |
Merge pull request #26713 from vespa-engine/jonmv/improve-test-job-retrying-choices
Include relevant production job when determining whether to retrying …
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java index 050b77a391e..ecd24b3577f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java @@ -303,7 +303,7 @@ public class DeploymentStatus { fallbackPlatform(change, job)); if (step.completedAt(change, firstProductionJobWithDeploymentInCloud).isEmpty()) { JobType typeWithZone = job.type().isSystemTest() ? JobType.systemTest(zones, cloud) : JobType.stagingTest(zones, cloud); - jobs.merge(job, List.of(new Job(typeWithZone, versions, step.readyAt(change), change)), DeploymentStatus::union); + jobs.merge(job, List.of(new Job(typeWithZone, versions, step.readyAt(change, firstProductionJobWithDeploymentInCloud), change)), DeploymentStatus::union); } }); }); @@ -679,7 +679,7 @@ public class DeploymentStatus { .asList().isEmpty()) testJobs.merge(testJob, List.of(new Job(testJob.type(), productionJob.versions(), - jobSteps().get(testJob).readyAt(productionJob.change), + jobSteps().get(testJob).readyAt(productionJob.change, Optional.of(job)), productionJob.change)), DeploymentStatus::union); }); |