diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-04-23 14:41:55 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-04-23 14:41:55 +0200 |
| commit | 892f76c6a9ab672dc58c2950e03ea9ebc2a69383 (patch) | |
| tree | ceccdac89d7bd0fd830124c8105c07435864ae9e | |
| parent | 531d10e0fe8cf36f270aaa97c67d611e183ba9e1 (diff) | |
Avoid continuously running tests in delay with more than one target
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 6 |
1 files changed, 4 insertions, 2 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 25a1d19f1e1..31d56fefe18 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 @@ -292,8 +292,10 @@ public class DeploymentTrigger { if (completedAt.isPresent()) jobs.add(deploymentJob(application, target, application.change(), job, reason, completedAt.get(), stepJobs)); } - else if (testJobs == null) - testJobs = testJobsFor(application, target, "Testing deployment for " + job.jobName(), completedAt.orElse(clock.instant())); + else if (testJobs == null) { + if ( ! alreadyTriggered(application, target)) + testJobs = testJobsFor(application, target, "Testing deployment for " + job.jobName(), completedAt.orElse(clock.instant())); + } } } else { // All jobs are complete -- find the time of completion of this step. |