diff options
Diffstat (limited to 'zuul')
| -rw-r--r-- | zuul/model.py | 2 | ||||
| -rw-r--r-- | zuul/reporter/__init__.py | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/zuul/model.py b/zuul/model.py index 1a7b1b79c..cfc45d78f 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -4924,7 +4924,7 @@ class QueueItem(zkobject.ZKObject): if data: job.setArtifactData(data) except RequirementsError as e: - self.warning(str(e)) + self.log.info(str(e)) fakebuild = Build.new(self.pipeline.manager.current_context, job=job, build_set=self.current_build_set, error_detail=str(e), result='FAILURE') diff --git a/zuul/reporter/__init__.py b/zuul/reporter/__init__.py index 5af48abc6..9a868eac4 100644 --- a/zuul/reporter/__init__.py +++ b/zuul/reporter/__init__.py @@ -273,7 +273,13 @@ class BaseReporter(object, metaclass=abc.ABCMeta): for job in item.getJobs(): build = item.current_build_set.getBuild(job.name) (result, url) = item.formatJobResult(job) - if result == 'SKIPPED': + # If child_jobs is being used to skip jobs, then the user + # probably has an expectation that some jobs will be + # skipped and doesn't need to see all of them. Otherwise, + # it may be a surprise and it may be better to include the + # job in the report. + if (build.error_detail and + 'Skipped due to child_jobs' in build.error_detail): skipped += 1 continue if not job.voting: |