opendev/system-config
Code Issues Proposed changes

Reconfigure jobs for gearman plugin.

Browse Source 
And reconfigure zuul.openstack.org for gearman.

Change-Id: I251135e3b0f2638bcc0d817dadb549c0fc2e0d2f
Reviewed-on: https://review.openstack.org/32164
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: James E. Blair <corvus@inaugust.com>
This commit is contained in:
James E. Blair 2013-06-07 08:53:27 -07:00 committed by James E. Blair
parent 839bc3c0b0
commit ae5c7ea776
26 changed files with 44 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
View File

@ -4,7 +4,7 @@
name: openstack-api-programming name: openstack-api-programming
project-type: maven project-type: maven
concurrent: true concurrent: true
node: precise && !jclouds node: precise
wrappers: wrappers:
- timeout: - timeout:
@ -12,9 +12,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
- markdown-docbook: - markdown-docbook:
@ -47,10 +44,7 @@
name: openstack-api-quick-start name: openstack-api-quick-start
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -78,10 +72,7 @@
name: openstack-api-ref name: openstack-api-ref
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -112,9 +103,6 @@
concurrent: false concurrent: false
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
@ -131,7 +119,7 @@
name: image-api-v2.0 name: image-api-v2.0
project-type: maven project-type: maven
concurrent: true concurrent: true
node: precise && !jclouds node: precise
wrappers: wrappers:
- timeout: - timeout:
@ -139,9 +127,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
- markdown-docbook: - markdown-docbook:
@ -175,10 +160,7 @@
name: network-api-v1.0 name: network-api-v1.0
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -203,10 +185,7 @@
- job: - job:
name: netconn-api-v2.0 name: netconn-api-v2.0
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -232,10 +211,7 @@
name: object-api-v1.0 name: object-api-v1.0
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -261,10 +237,7 @@
name: compute-api-v2.0 name: compute-api-v2.0
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -291,9 +264,6 @@
concurrent: false concurrent: false
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: /usr/local/jenkins/slave_scripts/run-xmllint.sh openstack-compute-api-2/src/os-compute-2.wadl - shell: /usr/local/jenkins/slave_scripts/run-xmllint.sh openstack-compute-api-2/src/os-compute-2.wadl
@ -311,10 +281,7 @@
name: block-api-v2.0 name: block-api-v2.0
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -341,10 +308,7 @@
name: identity-api-v2.0 name: identity-api-v2.0
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -371,10 +335,7 @@
name: image-api-v1.1 name: image-api-v1.1
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep

9
modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
View File

@ -2,9 +2,6 @@
name: 'gate-{name}-chef-unit' name: 'gate-{name}-chef-unit'
node: '{node}' node: '{node}'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- chef-cookbook-prep - chef-cookbook-prep
@ -17,9 +14,6 @@
name: 'gate-{name}-chef-lint' name: 'gate-{name}-chef-lint'
node: '{node}' node: '{node}'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- chef-cookbook-prep - chef-cookbook-prep
@ -32,9 +26,6 @@
name: 'gate-{name}-chef-style' name: 'gate-{name}-chef-style'
node: '{node}' node: '{node}'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- chef-cookbook-prep - chef-cookbook-prep

1
modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
View File

@ -1,6 +1,5 @@
- defaults: - defaults:
name: global name: global
zuul-url: http://zuul.openstack.org:8001/jenkins_endpoint
description: | description: |
<p><b>This job is managed by puppet and will be overwritten.</b></p> <p><b>This job is managed by puppet and will be overwritten.</b></p>

27
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
View File

@ -14,9 +14,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout
@ -50,9 +47,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout
@ -87,9 +81,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout
@ -124,9 +115,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout
@ -161,9 +149,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout
@ -473,9 +458,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout
@ -512,9 +494,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout
@ -549,9 +528,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout
@ -587,9 +563,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: devstack-precise default: devstack-precise
triggers:
- zuul
builders: builders:
- devstack-inprogress - devstack-inprogress
- devstack-checkout - devstack-checkout

15
modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
View File

@ -1,7 +1,7 @@
- job: - job:
name: check-gerrit-unittests name: check-gerrit-unittests
project-type: maven project-type: maven
node: precise && !jclouds node: precise
wrappers: wrappers:
- timeout: - timeout:
@ -9,9 +9,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
- gerrit-preclean - gerrit-preclean
@ -37,7 +34,7 @@
- job: - job:
name: gate-gerrit-unittests name: gate-gerrit-unittests
project-type: maven project-type: maven
node: precise && !jclouds node: precise
wrappers: wrappers:
- timeout: - timeout:
@ -45,9 +42,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
- gerrit-preclean - gerrit-preclean
@ -68,7 +62,7 @@
- job: - job:
name: gerrit-package name: gerrit-package
project-type: maven project-type: maven
node: precise && !jclouds node: precise
wrappers: wrappers:
- timeout: - timeout:
@ -76,9 +70,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
- gerrit-preclean - gerrit-preclean

3
modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml
View File

@ -2,9 +2,6 @@
name: gate-gitdm name: gate-gitdm
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |

3
modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml
View File

@ -2,9 +2,6 @@
name: gate-hacking-integration-{target-project} name: gate-hacking-integration-{target-project}
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |

3
modules/openstack_project/files/jenkins_job_builder/config/hooks.yaml
View File

@ -2,8 +2,5 @@
name: 'hook-{name}-rtfd' name: 'hook-{name}-rtfd'
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- shell: 'curl -X POST https://readthedocs.org/build/{rtfd-id} >/dev/null' - shell: 'curl -X POST https://readthedocs.org/build/{rtfd-id} >/dev/null'

3
modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
View File

@ -2,9 +2,6 @@
name: gate-horizon-selenium name: gate-horizon-selenium
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- selenium: - selenium:

3
modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml
View File

@ -4,9 +4,6 @@
concurrent: false concurrent: false
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep

10
modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
View File

@ -1,10 +1,7 @@
- job-template: - job-template:
name: 'gate-{name}-build' name: 'gate-{name}-build'
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -23,10 +20,7 @@
- job-template: - job-template:
name: '{name}-hpi-artifact' name: '{name}-hpi-artifact'
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep

6
modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml
View File

@ -3,9 +3,6 @@
name: jenkins-job-builder-docs name: jenkins-job-builder-docs
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- docs: - docs:
@ -25,9 +22,6 @@
name: jenkins-job-builder-compare-xml name: jenkins-job-builder-compare-xml
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: "./tools/run-compare-xml.sh" - shell: "./tools/run-compare-xml.sh"

83
modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
View File

@ -1,10 +1,7 @@
- job: - job:
name: gate-openstack-manuals-cli-guide name: gate-openstack-manuals-cli-guide
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -30,10 +27,7 @@
- job: - job:
name: gate-openstack-manuals-operations-guide name: gate-openstack-manuals-operations-guide
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -60,9 +54,6 @@
name: gate-openstack-manuals-validate name: gate-openstack-manuals-validate
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: "./tools/validate.py" - shell: "./tools/validate.py"
@ -73,10 +64,7 @@
- job: - job:
name: openstack-cli-guide name: openstack-cli-guide
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -101,10 +89,7 @@
- job: - job:
name: openstack-basic-install-fedora name: openstack-basic-install-fedora
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul-post
properties: properties:
- inject: - inject:
@ -134,10 +119,7 @@
- job: - job:
name: openstack-basic-install-ubuntu name: openstack-basic-install-ubuntu
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -170,10 +152,7 @@
- job: - job:
name: openstack-admin-manual-block name: openstack-admin-manual-block
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -203,10 +182,7 @@
- job: - job:
name: openstack-glossary name: openstack-glossary
project-type: maven project-type: maven
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -232,10 +208,7 @@
name: openstack-image-guide name: openstack-image-guide
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -266,10 +239,7 @@
name: openstack-admin-manual-compute name: openstack-admin-manual-compute
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -300,10 +270,7 @@
name: openstack-admin-manual-netconn name: openstack-admin-manual-netconn
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -334,10 +301,7 @@
name: openstack-admin-manual-object name: openstack-admin-manual-object
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
prebuilders: prebuilders:
- gerrit-git-prep - gerrit-git-prep
@ -368,10 +332,7 @@
- job: - job:
name: openstack-docs-site name: openstack-docs-site
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
@ -395,10 +356,7 @@
name: openstack-ha-guide name: openstack-ha-guide
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
properties: properties:
- inject: - inject:
@ -431,10 +389,7 @@
name: openstack-install-deploy-guide-apt-fedora name: openstack-install-deploy-guide-apt-fedora
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
properties: properties:
- inject: - inject:
@ -465,10 +420,7 @@
name: openstack-install-deploy-guide-ubuntu name: openstack-install-deploy-guide-ubuntu
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
properties: properties:
- inject: - inject:
@ -499,10 +451,7 @@
name: openstack-operations-guide name: openstack-operations-guide
project-type: maven project-type: maven
concurrent: false concurrent: false
node: precise && !jclouds node: precise
triggers:
- zuul-post
properties: properties:
- inject: - inject:

8
modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml
View File

@ -11,7 +11,6 @@
triggers: triggers:
- timed: '4 21 * * *' - timed: '4 21 * * *'
- zuul
builders: builders:
- update-pypi-mirror - update-pypi-mirror
@ -32,9 +31,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul
builders: builders:
- update-pypi-mirror - update-pypi-mirror
@ -56,7 +52,6 @@
triggers: triggers:
- timed: '12 21 * * *' - timed: '12 21 * * *'
- zuul
builders: builders:
- update-pypi-mirror - update-pypi-mirror
@ -77,9 +72,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul
builders: builders:
- update-pypi-mirror - update-pypi-mirror

4
modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
View File

@ -1,7 +1,3 @@
- job: - job:
name: gate-noop name: gate-noop
triggers:
- zuul
node: precise node: precise

9
modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
View File

@ -2,9 +2,6 @@
name: config-compare-xml name: config-compare-xml
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: "./tools/run-compare-xml.sh openstack-infra config" - shell: "./tools/run-compare-xml.sh openstack-infra config"
@ -17,9 +14,6 @@
name: gate-config-layout name: gate-config-layout
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: "./tools/run-layout.sh openstack-infra config" - shell: "./tools/run-layout.sh openstack-infra config"
@ -33,9 +27,6 @@
name: ci-docs name: ci-docs
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- docs: - docs:

3
modules/openstack_project/files/jenkins_job_builder/config/openstack-planet.yaml
View File

@ -3,9 +3,6 @@
name: 'gate-openstack-planet-unittest' name: 'gate-openstack-planet-unittest'
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |

3
modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml
View File

@ -2,9 +2,6 @@
name: '{name}-docs' name: '{name}-docs'
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- docs: - docs:

3
modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml
View File

@ -4,9 +4,6 @@
name: openstack-qa-docs name: openstack-qa-docs
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |

9
modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
View File

@ -2,9 +2,6 @@
name: 'gate-{name}-puppet-unit-{puppet_version}' name: 'gate-{name}-puppet-unit-{puppet_version}'
node: '{node}' node: '{node}'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |
@ -21,9 +18,6 @@
name: 'gate-{name}-puppet-lint' name: 'gate-{name}-puppet-lint'
node: '{node}' node: '{node}'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- puppet-lint - puppet-lint
@ -35,9 +29,6 @@
name: 'gate-{name}-puppet-syntax' name: 'gate-{name}-puppet-syntax'
node: '{node}' node: '{node}'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- puppet-syntax - puppet-syntax

3
modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml
View File

@ -2,9 +2,6 @@
name: '{name}-pypi-upload' name: '{name}-pypi-upload'
node: pypi node: pypi
triggers:
- zuul-post
builders: builders:
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe

30
modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
View File

@ -7,9 +7,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- coverage: - coverage:
@ -26,9 +23,6 @@
- job-template: - job-template:
name: 'gate-{name}-pep8' name: 'gate-{name}-pep8'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- pep8: - pep8:
@ -45,9 +39,6 @@
- job-template: - job-template:
name: 'gate-{name}-pylint' name: 'gate-{name}-pylint'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- pylint: - pylint:
@ -70,9 +61,6 @@
fail: true fail: true
- timestamps - timestamps
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- python26: - python26:
@ -119,9 +107,6 @@
description: Label of node to use for this build description: Label of node to use for this build
default: '{node}' default: '{node}'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- python27: - python27:
@ -156,9 +141,6 @@
- job-template: - job-template:
name: 'gate-{name}-docs' name: 'gate-{name}-docs'
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- docs: - docs:
@ -182,9 +164,6 @@
name: 'gate-{name}-pyflakes' name: 'gate-{name}-pyflakes'
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- pyflakes: - pyflakes:
@ -199,9 +178,6 @@
name: '{name}-tarball' name: '{name}-tarball'
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- tarball: - tarball:
@ -220,9 +196,6 @@
concurrent: false concurrent: false
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- tarball: - tarball:
@ -245,9 +218,6 @@
name: 'gate-{name}-requirements' name: 'gate-{name}-requirements'
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |

3
modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml
View File

@ -2,9 +2,6 @@
name: gate-requirements-install name: gate-requirements-install
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |

6
modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
View File

@ -2,9 +2,6 @@
name: '{name}-upstream-translation-update' name: '{name}-upstream-translation-update'
concurrent: false concurrent: false
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |
@ -43,9 +40,6 @@
name: manuals-upstream-translation-update name: manuals-upstream-translation-update
concurrent: false concurrent: false
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |

6
modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
View File

@ -3,9 +3,6 @@
name: zuul-docs name: zuul-docs
node: precise node: precise
triggers:
- zuul-post
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- docs: - docs:
@ -25,9 +22,6 @@
name: 'dev-zuul-coverage' name: 'dev-zuul-coverage'
node: precise node: precise
triggers:
- zuul
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- coverage: - coverage:

25
modules/openstack_project/manifests/zuul_prod.pp
View File

@ -15,27 +15,17 @@ class openstack_project::zuul_prod(
$gearman_workers = [] $gearman_workers = []
) { ) {
# Turn a list of hostnames into a list of iptables rules # Turn a list of hostnames into a list of iptables rules
$iptables_rules6 = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT') $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
$iptables_rules4 = flatten ([$iptables_rules6,
[ "-m state --state NEW -m tcp -p tcp --dport 8001 -s ${jenkins_host} -j ACCEPT" ]])
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80], iptables_public_tcp_ports => [80],
iptables_rules6 => $iptables_rules6, iptables_rules6 => $iptables_rules,
iptables_rules4 => $iptables_rules4, iptables_rules4 => $iptables_rules,
sysadmins => $sysadmins, sysadmins => $sysadmins,
} }
# co-host gearman-job-server
class { 'gearman':
listen => '::',
}
class { '::zuul': class { '::zuul':
vhost_name => $vhost_name, vhost_name => $vhost_name,
jenkins_server => $jenkins_url,
jenkins_user => $jenkins_user,
jenkins_apikey => $jenkins_apikey,
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key, zuul_ssh_private_key => $zuul_ssh_private_key,
@ -43,6 +33,7 @@ class openstack_project::zuul_prod(
push_change_refs => false, push_change_refs => false,
status_url => 'http://status.openstack.org/zuul/', status_url => 'http://status.openstack.org/zuul/',
statsd_host => $statsd_host, statsd_host => $statsd_host,
revision => 'feature/gearman',
} }
file { '/etc/zuul/layout.yaml': file { '/etc/zuul/layout.yaml':
@ -50,17 +41,25 @@ class openstack_project::zuul_prod(
source => 'puppet:///modules/openstack_project/zuul/layout.yaml', source => 'puppet:///modules/openstack_project/zuul/layout.yaml',
notify => Exec['zuul-reload'], notify => Exec['zuul-reload'],
} }
file { '/etc/zuul/openstack_functions.py': file { '/etc/zuul/openstack_functions.py':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py', source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py',
notify => Exec['zuul-reload'], notify => Exec['zuul-reload'],
} }
file { '/etc/zuul/logging.conf': file { '/etc/zuul/logging.conf':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/logging.conf', source => 'puppet:///modules/openstack_project/zuul/logging.conf',
notify => Exec['zuul-reload'], notify => Exec['zuul-reload'],
} }
file { '/etc/zuul/gearman-logging.conf':
ensure => present,
source => 'puppet:///modules/openstack_project/zuul/gearman-logging.conf',
notify => Exec['zuul-reload'],
}
class { '::recheckwatch': class { '::recheckwatch':
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,