diff options
| author | jonmv <venstad@gmail.com> | 2023-04-12 10:33:59 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-04-12 10:33:59 +0200 |
| commit | 04e0ae14d21968774cb724d8f940c59672807821 (patch) | |
| tree | 2dd2750ac424f59e10d8c59c157bfe9c0c665af7 | |
| parent | d4eeb7d873937b00869cd92a3538184b9863bd86 (diff) | |
Include relevant production job when determining whether to retrying tests
| -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); }); |