opendev/system-config
Code Issues Proposed changes

Add Zuul module to job filler.

Browse Source 
Move configuration of Zuul parameters to a job filler module.

Note: I've used "triggers:" instead of "trigger:"; I'd like to
move the other triggers to use that and be more like the
"builders:" section.

Change-Id: I28af1f795f4e304faaf0e687bc3fdc76949a7664
This commit is contained in:
James E. Blair 2012-06-15 17:26:38 -07:00
parent 5d5a613ab4
commit 8d4a8b7658
10 changed files with 144 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
modules/jenkins_jobs/files/modules/zuul.py Normal file
View File

@ -0,0 +1,77 @@
#! /usr/bin/env python
# Copyright (C) 2012 OpenStack, LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# Jenkins Job module for Zuul
ZUUL_PARAMETERS = [
{'description': 'Zuul provided key to link builds with Gerrit events',
'name': 'UUID',
'type': 'string'},
{'description': 'Zuul provided project name',
'name': 'GERRIT_PROJECT',
'type': 'string'},
{'description': 'Zuul provided branch name',
'name': 'GERRIT_BRANCH',
'type': 'string'},
{'description': 'Zuul provided list of dependent changes to merge',
'name': 'GERRIT_CHANGES',
'type': 'string'}
]
ZUUL_POST_PARAMETERS = [
{'description': 'Zuul provided key to link builds with Gerrit events',
'name': 'UUID',
'type': 'string'},
{'description': 'Zuul provided project name',
'name': 'GERRIT_PROJECT',
'type': 'string'},
{'description': 'Zuul provided ref name',
'name': 'GERRIT_REFNAME',
'type': 'string'},
{'description': 'Zuul provided old reference for ref-updated',
'name': 'GERRIT_OLDREV',
'type': 'string'},
{'description': 'Zuul provided new reference for ref-updated',
'name': 'GERRIT_NEWREV',
'type': 'string'}
]
ZUUL_NOTIFICATIONS = [
{'URL': 'http://127.0.0.1:8001/jenkins_endpoint',
'protocol': 'HTTP'}
]
class zuul(object):
def __init__(self, data):
self.data = data
self._update()
def _update(self):
data = self.data
if ('zuul' not in data.get('triggers', []) and
'zuul_post' not in data.get('triggers', [])):
return
if 'parameters' not in data:
data['parameters'] = []
if 'notification_endpoints' not in data:
data['notification_endpoints'] = []
data['notification_endpoints'].extend(ZUUL_NOTIFICATIONS)
if 'zuul' in data.get('triggers', []):
data['parameters'].extend(ZUUL_PARAMETERS)
if 'zuul_post' in data.get('triggers', []):
data['parameters'].extend(ZUUL_POST_PARAMETERS)
def gen_xml(self, xml_parent):
pass

20
modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml
View File

@ -6,6 +6,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-devstack-gate-merge'
@ -14,23 +15,8 @@ main:
project: 'devstack-gate'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep

20
modules/jenkins_jobs/files/projects/openstack/devstack.yml
View File

@ -6,6 +6,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-devstack-merge'
@ -14,23 +15,8 @@ main:
project: 'devstack'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep

83
modules/jenkins_jobs/files/projects/openstack/gerrit.yml
View File

@ -6,6 +6,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-gerrit-merge'
@ -15,23 +16,8 @@ main:
authenticatedBuild: 'true'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -51,6 +37,7 @@ modules:
- assignednode
- builders:prebuilders
- publishers
- zuul
main:
name: 'check-gerrit-unittests'
@ -60,23 +47,8 @@ main:
authenticatedBuild: 'true'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
prebuilders:
- gerrit_git_prep
@ -113,6 +85,7 @@ modules:
- builders:prebuilders
- builders:postbuilders
- publishers
- zuul
main:
name: 'gate-gerrit-unittests'
@ -122,23 +95,8 @@ main:
authenticatedBuild: 'true'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
prebuilders:
- gerrit_git_prep
@ -169,6 +127,7 @@ modules:
- builders:prebuilders
- builders:postbuilders
- publishers
- zuul
main:
name: 'gerrit-package'
@ -178,26 +137,8 @@ main:
authenticatedBulid: 'false'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_REFNAME
type: string
description: Zuul provided ref name
- name: GERRIT_OLDREV
type: string
description: Zuul provided old reference for ref-updated
- name: GERRIT_NEWREV
type: string
description: Zuul provided new reference for ref-updated
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul_post
prebuilders:
- gerrit_git_prep

40
modules/jenkins_jobs/files/projects/openstack/openstack-ci-puppet.yml
View File

@ -6,6 +6,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-ci-puppet-merge'
@ -14,23 +15,8 @@ main:
project: 'openstack-ci-puppet'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -49,6 +35,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-ci-puppet-syntax'
@ -57,23 +44,8 @@ main:
project: 'openstack-ci-puppet'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep

40
modules/jenkins_jobs/files/projects/openstack/pypi-mirror.yml
View File

@ -6,6 +6,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-pypi-mirror-pyflakes'
@ -14,23 +15,8 @@ main:
project: 'pypi-mirror'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -50,6 +36,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-pypi-mirror-merge'
@ -58,23 +45,8 @@ main:
project: 'pypi-mirror'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep

40
modules/jenkins_jobs/files/projects/openstack/tempest.yml
View File

@ -6,6 +6,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-tempest-pep8'
@ -14,23 +15,8 @@ main:
project: 'tempest'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -53,6 +39,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-tempest-merge'
@ -61,23 +48,8 @@ main:
project: 'tempest'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep

60
modules/jenkins_jobs/files/projects/openstack/zuul.yml
View File

@ -6,6 +6,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-zuul-pyflakes'
@ -14,23 +15,8 @@ main:
project: 'zuul'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -50,6 +36,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-zuul-pep8'
@ -58,23 +45,8 @@ main:
project: 'zuul'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -97,6 +69,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-zuul-merge'
@ -105,23 +78,8 @@ main:
project: 'zuul'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep

40
modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml
View File

@ -18,6 +18,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-ceilometeer-python26-essex'
@ -27,23 +28,8 @@ main:
authenticatedBuild: 'true'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -63,6 +49,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-ceilometeer-python27-essex'
@ -73,23 +60,8 @@ main:
disabled: 'false'
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep

104
modules/jenkins_jobs/files/templates/python_jobs.yml
View File

@ -46,6 +46,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-@NAME@-pep8'
@ -56,23 +57,8 @@ main:
disabled: @DISABLED@
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -95,6 +81,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-@NAME@-python26'
@ -105,23 +92,8 @@ main:
disabled: @DISABLED@
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -146,6 +118,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-@NAME@-python27'
@ -156,23 +129,8 @@ main:
disabled: @DISABLED@
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -197,6 +155,7 @@ modules:
- trigger_pollscm
- builders
- publishers
- zuul
main:
name: '@NAME@-docs'
@ -234,6 +193,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: 'gate-@NAME@-merge'
@ -244,23 +204,8 @@ main:
disabled: @DISABLED@
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_BRANCH
type: string
description: Zuul provided branch name
- name: GERRIT_CHANGES
type: string
description: Zuul provided list of dependent changes to merge
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul
builders:
- gerrit_git_prep
@ -309,6 +254,7 @@ modules:
- assignednode
- builders
- publishers
- zuul
main:
name: '@NAME@-tarball'
@ -319,26 +265,8 @@ main:
disabled: @DISABLED@
concurrent: 'true'
parameters:
- name: UUID
type: string
description: Zuul provided key to link builds with Gerrit events
- name: GERRIT_PROJECT
type: string
description: Zuul provided project name
- name: GERRIT_REFNAME
type: string
description: Zuul provided ref name
- name: GERRIT_OLDREV
type: string
description: Zuul provided old reference for ref-updated
- name: GERRIT_NEWREV
type: string
description: Zuul provided new reference for ref-updated
notification_endpoints:
- protocol: HTTP
URL: http://127.0.0.1:8001/jenkins_endpoint
triggers:
- zuul_post
builders:
- gerrit_git_prep