diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-08-01 13:07:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 13:07:34 +0200 |
| commit | a7131636baabbc2b05e48684315e26c9ca7f4761 (patch) | |
| tree | 409258b0da346b225d0da5686a834f17dd35abb0 /controller-server | |
| parent | 9b1854255abdcf54d504f73e5272122d461b7bc8 (diff) | |
| parent | 9f0af931c1e2bb9c2d256b4763a8da7e1fcc725f (diff) | |
Merge pull request #23558 from vespa-engine/jonmv/require-test-success-in-right-instance
Require test success in right instance, or else start relevant test job
Diffstat (limited to 'controller-server')
2 files changed, 4 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 24cd92d005f..1d7d75d9193 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 @@ -544,7 +544,9 @@ public class DeploymentStatus { if (job.type().isProduction() && job.type().isDeployment()) { declaredTest(job.application(), testType).ifPresent(testJob -> { for (Job productionJob : versionsList) - if (allJobs.successOn(testType, productionJob.versions()).asList().isEmpty()) + if (allJobs.successOn(testType, productionJob.versions()) + .instance(testJob.application().instance()) + .asList().isEmpty()) testJobs.merge(testJob, List.of(new Job(testJob.type(), productionJob.versions(), jobSteps().get(testJob).readyAt(productionJob.change), diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java index f4c4b8bebd4..d683f1cb5c7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java @@ -76,7 +76,7 @@ public class Versions { targetRevision.equals(versions.targetRevision()); } - /** Returns wheter this change could result in the given target versions. */ + /** Returns whether this change could result in the given target versions. */ public boolean targetsMatch(Change change) { return change.platform().map(targetPlatform::equals).orElse(true) && change.revision().map(targetRevision::equals).orElse(true); |