diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-26 19:06:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-26 19:06:45 +0000 |
| commit | 58fbc8854a5beb30b6b46920e3bc655749bbbe75 (patch) | |
| tree | 42e33719c766915b0c4588646669c39d2e28e950 | |
| parent | 79427a40201e190c4162e98817695adb0a8fd337 (diff) | |
| parent | f8b42fbcc35919078339814ce0b2fb39adb138be (diff) | |
| download | zuul-58fbc8854a5beb30b6b46920e3bc655749bbbe75.tar.gz | |
Merge "Don't report on non-live changes dequeueing"
| -rw-r--r-- | zuul/scheduler.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/zuul/scheduler.py b/zuul/scheduler.py index 25f819263..131ad62c3 100644 --- a/zuul/scheduler.py +++ b/zuul/scheduler.py @@ -1365,10 +1365,11 @@ class BasePipelineManager(object): self.cancelJobs(item) self.dequeueItem(item) self.pipeline.setDequeuedNeedingChange(item) - try: - self.reportItem(item) - except MergeFailure: - pass + if item.live: + try: + self.reportItem(item) + except MergeFailure: + pass return (True, nnfi, ready_ahead) dep_items = self.getFailingDependentItems(item) actionable = change_queue.isActionable(item) |