zuul/zuul
Code Issues Proposed changes

Merge "Include skip reason in build error_detail"

Browse Source
This commit is contained in:
Zuul
2022-10-25 21:18:34 +00:00
committed by Gerrit Code Review
parent b70d8de85b aeb777e77a
commit e9a428bb91
4 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zuul/manager/__init__.py
View File

@@ -480,7 +480,7 @@ class PipelineManager(metaclass=ABCMeta):
if item.current_build_set.config_errors:
item.setConfigErrors(item.getConfigErrors())
if item.dequeued_needing_change:
item.setDequeuedNeedingChange()
item.setDequeuedNeedingChange(item.dequeued_needing_change)
if item.dequeued_missing_requirements:
item.setDequeuedMissingRequirements()
@@ -1510,7 +1510,7 @@ class PipelineManager(metaclass=ABCMeta):
"it can no longer merge" % item.change)
self.cancelJobs(item)
if item.isBundleFailing():
item.setDequeuedBundleFailing()
item.setDequeuedBundleFailing('Bundle is failing')
elif not meets_reqs:
item.setDequeuedMissingRequirements()
else:
@@ -1967,7 +1967,8 @@ class PipelineManager(metaclass=ABCMeta):
build_set.jobNodeRequestComplete(request.job_name, nodeset)
# Put a fake build through the cycle to clean it up.
if not request.fulfilled:
build_set.item.setNodeRequestFailure(job)
build_set.item.setNodeRequestFailure(
job, f'Node request {request.id} failed')
self._resumeBuilds(build_set)
tenant = build_set.item.pipeline.tenant
tenant.semaphore_handler.release(