Browse Source

Merge "Fix runtime stats reporting for noop job"

changes/32/553932/1
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
ccf29c4407
2 changed files with 5 additions and 4 deletions
  1. +4
    -0
      zuul/executor/client.py
  2. +1
    -4
      zuul/manager/__init__.py

+ 4
- 0
zuul/executor/client.py View File

@ -269,6 +269,10 @@ class ExecutorClient(object):
build.parameters = params
build.nodeset = nodeset
self.log.debug("Adding build %s of job %s to item %s" %
(build, job, item))
item.addBuild(build)
if job.name == 'noop':
self.sched.onBuildStarted(build)
self.sched.onBuildCompleted(build, 'SUCCESS', {})


+ 1
- 4
zuul/manager/__init__.py View File

@ -392,13 +392,10 @@ class PipelineManager(object):
try:
nodeset = item.current_build_set.getJobNodeSet(job.name)
self.sched.nodepool.useNodeSet(nodeset)
build = self.sched.executor.execute(
self.sched.executor.execute(
job, item, self.pipeline,
build_set.dependent_changes,
build_set.merger_items)
self.log.debug("Adding build %s of job %s to item %s" %
(build, job, item))
item.addBuild(build)
except Exception:
self.log.exception("Exception while executing job %s "
"for change %s:" % (job, item.change))


Loading…
Cancel
Save