Browse Source

Move status_url to webapp config section

This is the last entry standing in the 'zuul' section, it seems
like it may be more appropriate here.

Change-Id: I48d2c4d69025a93a61c4d4fc64574545e3215e2c
changes/59/480759/2
James E. Blair 4 years ago
parent
commit
4f3e6227be
  1. 17
      doc/source/admin/components.rst
  2. 2
      tests/fixtures/zuul-connections-merger.conf
  3. 2
      tests/fixtures/zuul-github-driver.conf
  4. 2
      tests/fixtures/zuul-push-reqs.conf
  5. 4
      zuul/driver/github/githubreporter.py
  6. 7
      zuul/reporter/__init__.py

17
doc/source/admin/components.rst

@ -54,18 +54,14 @@ Client connection information for gearman.
zookeeper
"""""""""
.. NOTE: this is a white lie at this point, since only the scheduler
uses this, however, we expect other components to use it later, so
it's reasonable for admins to plan for this now.
**hosts**
A list of zookeeper hosts for Zuul to use when communicating with
Nodepool. ``hosts=zk1.example.com,zk2.example.com,zk3.example.com``
zuul
""""
**status_url**
URL that will be posted in Zuul comments made to changes when
starting jobs for a change. Used by zuul-scheduler only.
``status_url=https://zuul.example.com/status``
Scheduler
---------
@ -126,6 +122,11 @@ webapp
optional value and ``1`` is used by default.
``status_expiry=1``
**status_url**
URL that will be posted in Zuul comments made to changes when
starting jobs for a change. Used by zuul-scheduler only.
``status_url=https://zuul.example.com/status``
scheduler
"""""""""

2
tests/fixtures/zuul-connections-merger.conf

@ -1,7 +1,7 @@
[gearman]
server=127.0.0.1
[zuul]
[webapp]
status_url=http://zuul.example.com/status
[merger]

2
tests/fixtures/zuul-github-driver.conf

@ -1,7 +1,7 @@
[gearman]
server=127.0.0.1
[zuul]
[webapp]
status_url=http://zuul.example.com/status/#{change.number},{change.patchset}
[merger]

2
tests/fixtures/zuul-push-reqs.conf

@ -1,7 +1,7 @@
[gearman]
server=127.0.0.1
[zuul]
[webapp]
status_url=http://zuul.example.com/status
[merger]

4
zuul/driver/github/githubreporter.py

@ -85,8 +85,8 @@ class GithubReporter(BaseReporter):
url_pattern = self.config.get('status-url')
if not url_pattern:
sched_config = self.connection.sched.config
if sched_config.has_option('zuul', 'status_url'):
url_pattern = sched_config.get('zuul', 'status_url')
if sched_config.has_option('webapp', 'status_url'):
url_pattern = sched_config.get('webapp', 'status_url')
url = item.formatUrlPattern(url_pattern) if url_pattern else ''
description = ''

7
zuul/reporter/__init__.py

@ -14,6 +14,7 @@
import abc
import logging
from zuul.lib.config import get_default
class BaseReporter(object, metaclass=abc.ABCMeta):
@ -69,10 +70,8 @@ class BaseReporter(object, metaclass=abc.ABCMeta):
return ret
def _formatItemReportStart(self, item, with_jobs=True):
status_url = ''
if self.connection.sched.config.has_option('zuul', 'status_url'):
status_url = self.connection.sched.config.get('zuul',
'status_url')
status_url = get_default(self.connection.sched.config,
'webapp', 'status_url', '')
return item.pipeline.start_message.format(pipeline=item.pipeline,
status_url=status_url)

Loading…
Cancel
Save