Remove job_name_in_report option
This option was to maintain backwards compatability with the report format used by the jenkins gerrit trigger plugin. We no longer need to worry about that. With the addition of various reporters which may need to report information in different formats, we should probably either move this to the gerrit driver, or make it customizable. For now, let's go ahead and remove the option and use the behavior we would have if it were set to true, which has been the case for OpenStack infra's and all of our third-party ci users for some time. Change-Id: I8f040e03b7074cf59eced6fca38e6b221051d93e
This commit is contained in:
parent
5af5b6d474
commit
8eac47f362
|
@ -128,11 +128,6 @@ layout.yaml to be useful.
|
|||
optional value and ``1`` is used by default.
|
||||
``status_expiry=1``
|
||||
|
||||
**job_name_in_report**
|
||||
Boolean value (``true`` or ``false``) that indicates whether the
|
||||
job name should be included in the report (normally only the URL
|
||||
is included). Defaults to ``false``. Used by zuul-server only.
|
||||
``job_name_in_report=true``
|
||||
|
||||
merger
|
||||
""""""
|
||||
|
|
|
@ -3,7 +3,6 @@ server=127.0.0.1
|
|||
|
||||
[zuul]
|
||||
tenant_config=config/multi-driver/main.yaml
|
||||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/git
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
server=127.0.0.1
|
||||
|
||||
[zuul]
|
||||
job_name_in_report=true
|
||||
status_url=http://zuul.example.com/status
|
||||
|
||||
[merger]
|
||||
|
|
|
@ -3,7 +3,6 @@ server=127.0.0.1
|
|||
|
||||
[zuul]
|
||||
tenant_config=main.yaml
|
||||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/merger-git
|
||||
|
|
|
@ -3,7 +3,6 @@ server=127.0.0.1
|
|||
|
||||
[zuul]
|
||||
tenant_config=config/zuul-connections-same-gerrit/main.yaml
|
||||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/merger-git
|
||||
|
|
|
@ -3,7 +3,6 @@ server=127.0.0.1
|
|||
|
||||
[zuul]
|
||||
tenant_config=config/zuul-connections-same-gerrit/main.yaml
|
||||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/git
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
server=127.0.0.1
|
||||
|
||||
[zuul]
|
||||
job_name_in_report=true
|
||||
status_url=http://zuul.example.com/status/#{change.number},{change.patchset}
|
||||
|
||||
[merger]
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
server=127.0.0.1
|
||||
|
||||
[zuul]
|
||||
job_name_in_report=true
|
||||
status_url=http://zuul.example.com/status
|
||||
|
||||
[merger]
|
||||
|
|
|
@ -3,7 +3,6 @@ server=127.0.0.1
|
|||
|
||||
[zuul]
|
||||
layout_config=layout-connections-multiple-voters.yaml
|
||||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/merger-git
|
||||
|
|
|
@ -4,7 +4,6 @@ server=127.0.0.1
|
|||
[zuul]
|
||||
tenant_config=main.yaml
|
||||
url_pattern=http://logs.example.com/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}
|
||||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/merger-git
|
||||
|
|
|
@ -3,7 +3,6 @@ server=127.0.0.1
|
|||
|
||||
[zuul]
|
||||
tenant_config=main.yaml
|
||||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/merger-git
|
||||
|
|
|
@ -142,11 +142,7 @@ class BaseReporter(object):
|
|||
elapsed = ' in %ds' % (s)
|
||||
else:
|
||||
elapsed = ''
|
||||
name = ''
|
||||
if config.has_option('zuul', 'job_name_in_report'):
|
||||
if config.getboolean('zuul',
|
||||
'job_name_in_report'):
|
||||
name = job.name + ' '
|
||||
name = job.name + ' '
|
||||
ret += '- %s%s : %s%s%s\n' % (name, url, result, elapsed,
|
||||
voting)
|
||||
return ret
|
||||
|
|
Loading…
Reference in New Issue