diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-12-27 16:07:55 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-12-27 16:07:55 +0100 |
commit | e4968037202bd007e306ea0403e09db792c8c468 (patch) | |
tree | a0f79c514f6adbbb14cb3cce992a90bf8808e8da /controller-server | |
parent | dc67053af0f14e761d449ede45dd20da9abfe8f8 (diff) |
Include implicit tests in "allSteps", as intended
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java | 13 |
1 files changed, 9 insertions, 4 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 4d9415beb49..cac6ce8bc0c 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 @@ -264,10 +264,15 @@ public class DeploymentStatus { // set it equal to application's when dependencies are completed. if (step instanceof DeploymentInstanceSpec) { instance = ((DeploymentInstanceSpec) step).name(); - for (JobType test : List.of(systemTest, stagingTest)) - dependencies.putIfAbsent(new JobId(application.id().instance(instance), test), - JobStepStatus.ofTestDeployment(new DeclaredZone(test.environment()), List.of(), - this, instance, test, false)); + for (JobType test : List.of(systemTest, stagingTest)) { + JobId job = new JobId(application.id().instance(instance), test); + if ( ! dependencies.containsKey(job)) { + var stepStatus = JobStepStatus.ofTestDeployment(new DeclaredZone(test.environment()), List.of(), + this, job.application().instance(), test, false); + dependencies.put(job, stepStatus); + allSteps.add(stepStatus); + } + } } if (step.isOrdered()) { |