Add option to specify Zuul URL.

This is needed in order to run Zuul on a server other than
the Jenkins master.

This isn't a great design, but it is minimally invasive to JJB
while we work on improving Zuul to remove the need for parameter
specification and notifications.

Change-Id: Ib4dabfc3fe37623031bdbe4a8ec53f25a6070a8e
Reviewed-on: https://review.openstack.org/17517
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-12-04 16:02:26 -08:00 committed by Jenkins
parent 84c32a232f
commit 99765cc468

View File

@ -15,6 +15,14 @@
"""
The Zuul module adds triggers that configure jobs for use with Zuul_.
To change the Zuul notification URL, set a global default::
- defaults:
name: global
zuul-url: http://127.0.0.1:8001/jenkins_endpoint
The above URL is the default.
.. _Zuul: http://ci.openstack.org/zuul/
"""
@ -128,10 +136,7 @@ ZUUL_POST_PARAMETERS = [
'name': 'ZUUL_SHORT_NEWREV'}},
]
ZUUL_NOTIFICATIONS = [
{'http':
{'url': 'http://127.0.0.1:8001/jenkins_endpoint'}}
]
DEFAULT_URL = 'http://127.0.0.1:8001/jenkins_endpoint'
class Zuul(jenkins_jobs.modules.base.Base):
@ -153,7 +158,16 @@ class Zuul(jenkins_jobs.modules.base.Base):
job['parameters'] = []
if 'notifications' not in job:
job['notifications'] = []
job['notifications'].extend(ZUUL_NOTIFICATIONS)
# This isn't a good pattern, and somewhat violates the
# spirit of the global defaults, but Zuul is working on
# a better design that should obviate the need for most
# of this module, so this gets it doen with minimal
# intrusion to the rest of JJB.
if parser.data.get('defaults', {}).get('global'):
url = parser.data['defaults']['global'].get(
'zuul-url', DEFAULT_URL)
notifications = [{'http': {'url': url}}]
job['notifications'].extend(notifications)
if 'zuul' in job.get('triggers', []):
job['parameters'].extend(ZUUL_PARAMETERS)
job['triggers'].remove('zuul')