diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-02-12 09:05:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 09:05:56 +0100 |
| commit | bf96e5a617adbf71766f9ba0620d7cbd88d8eae1 (patch) | |
| tree | b531636f2a7df50add350b7d1c5cdf313411a5ff | |
| parent | b44d662b4fb2e71c0da0484760194b9d0bc4d21a (diff) | |
| parent | 5b4101564cce6218898769f36f84ed3b0f54cd0e (diff) | |
Merge pull request #8471 from vespa-engine/jvenstad/simplify-little-thing
Remove code that would never remove anything
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 8 |
1 files changed, 3 insertions, 5 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 16f08ad1e15..49788b643e0 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 @@ -45,6 +45,7 @@ import static com.yahoo.vespa.hosted.controller.api.integration.BuildService.Job import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.component; import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.stagingTest; import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.systemTest; +import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.Comparator.comparing; import static java.util.Comparator.naturalOrder; @@ -326,11 +327,8 @@ public class DeploymentTrigger { if (completedAt.isPresent() && canTrigger(job, versions, application, stepJobs)) { jobs.add(deploymentJob(application, versions, change, job, reason, completedAt.get())); } - if ( ! alreadyTriggered(application, versions)) { - // Only remove test jobs that target this combination - if (testJobs == null) testJobs = new ArrayList<>(); - testJobs.removeIf(j -> versions.sourcesMatchIfPresent(j.triggering) && - versions.targetsMatch(j.triggering)); + if ( ! alreadyTriggered(application, versions) && testJobs == null) { + testJobs = emptyList(); } } else if (testJobs == null) { |