Merge "Explicitely print the result status of each playbook run" into feature/zuulv3
diff --git a/.zuul.yaml b/.zuul.yaml
index a997b05..ff1a523 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -43,7 +43,7 @@
- project:
name: openstack-infra/zuul
- check:
+ infra-check:
jobs:
- build-openstack-infra-sphinx-docs:
success-url: 'html/feature/zuulv3/'
@@ -65,7 +65,7 @@
files:
- zuul/cmd/migrate.py
- playbooks/zuul-migrate/.*
- gate:
+ infra-gate:
jobs:
- build-openstack-infra-sphinx-docs:
success-url: 'html/feature/zuulv3/'
@@ -75,7 +75,7 @@
- zuul/cmd/migrate.py
- playbooks/zuul-migrate/.*
- zuul-stream-functional
- post:
+ infra-post:
jobs:
- publish-openstack-sphinx-docs-infra
- publish-openstack-python-branch-tarball
diff --git a/zuul/connection/__init__.py b/zuul/connection/__init__.py
index 3655115..4fb49e3 100644
--- a/zuul/connection/__init__.py
+++ b/zuul/connection/__init__.py
@@ -46,10 +46,9 @@
def logEvent(self, event):
self.log.debug(
- 'Scheduling {driver} event from {connection}: {event}'.format(
- driver=self.driver.name,
+ 'Scheduling event from {connection}: {event}'.format(
connection=self.connection_name,
- event=event.type))
+ event=event))
try:
if self.statsd:
self.statsd.incr(
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py
index 3c0c11f..b692415 100644
--- a/zuul/manager/__init__.py
+++ b/zuul/manager/__init__.py
@@ -42,9 +42,8 @@
class PipelineManager(object):
"""Abstract Base Class for enqueing and processing Changes in a Pipeline"""
- log = logging.getLogger("zuul.PipelineManager")
-
def __init__(self, sched, pipeline):
+ self.log = logging.getLogger("zuul.Pipeline.%s" % (pipeline.name,))
self.sched = sched
self.pipeline = pipeline
self.event_filters = []
diff --git a/zuul/manager/dependent.py b/zuul/manager/dependent.py
index 411894e..5aef453 100644
--- a/zuul/manager/dependent.py
+++ b/zuul/manager/dependent.py
@@ -10,8 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import logging
-
from zuul import model
from zuul.manager import PipelineManager, StaticChangeQueueContextManager
from zuul.manager import DynamicChangeQueueContextManager
@@ -25,7 +23,6 @@
using the Optmistic Branch Prediction logic with Nearest Non-Failing Item
reparenting algorithm for handling errors.
"""
- log = logging.getLogger("zuul.DependentPipelineManager")
changes_merge = True
def __init__(self, *args, **kwargs):
diff --git a/zuul/manager/independent.py b/zuul/manager/independent.py
index 7b0a9f5..65f5ca0 100644
--- a/zuul/manager/independent.py
+++ b/zuul/manager/independent.py
@@ -10,8 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import logging
-
from zuul import model
from zuul.manager import PipelineManager, DynamicChangeQueueContextManager
@@ -19,7 +17,6 @@
class IndependentPipelineManager(PipelineManager):
"""PipelineManager that puts every Change into its own ChangeQueue."""
- log = logging.getLogger("zuul.IndependentPipelineManager")
changes_merge = False
def _postConfig(self, layout):
diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index c321bc0..a926f6e 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -262,22 +262,16 @@
self.zk = zk
def addEvent(self, event):
- self.log.debug("Adding trigger event: %s" % event)
self.trigger_event_queue.put(event)
self.wake_event.set()
- self.log.debug("Done adding trigger event: %s" % event)
def onBuildStarted(self, build):
- self.log.debug("Adding start event for build: %s" % build)
build.start_time = time.time()
event = BuildStartedEvent(build)
self.result_event_queue.put(event)
self.wake_event.set()
- self.log.debug("Done adding start event for build: %s" % build)
def onBuildCompleted(self, build, result, result_data):
- self.log.debug("Adding complete event for build: %s result: %s" % (
- build, result))
build.end_time = time.time()
build.result_data = result_data
# Note, as soon as the result is set, other threads may act
@@ -316,20 +310,15 @@
event = BuildCompletedEvent(build)
self.result_event_queue.put(event)
self.wake_event.set()
- self.log.debug("Done adding complete event for build: %s" % build)
def onMergeCompleted(self, build_set, merged, updated,
commit, files, repo_state):
- self.log.debug("Adding merge complete event for build set: %s" %
- build_set)
event = MergeCompletedEvent(build_set, merged,
updated, commit, files, repo_state)
self.result_event_queue.put(event)
self.wake_event.set()
def onNodesProvisioned(self, req):
- self.log.debug("Adding nodes provisioned event for build set: %s" %
- req.build_set)
event = NodesProvisionedEvent(req)
self.result_event_queue.put(event)
self.wake_event.set()