From ae5c7ea77605b0982487240ae291fe392d519bda Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 7 Jun 2013 08:53:27 -0700 Subject: [PATCH] Reconfigure jobs for gearman plugin. And reconfigure zuul.openstack.org for gearman. Change-Id: I251135e3b0f2638bcc0d817dadb549c0fc2e0d2f Reviewed-on: https://review.openstack.org/32164 Tested-by: Jenkins Reviewed-by: Jeremy Stanley Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: James E. Blair --- .../jenkins_job_builder/config/api-jobs.yaml | 61 +++----------- .../jenkins_job_builder/config/chef-jobs.yaml | 9 -- .../jenkins_job_builder/config/defaults.yaml | 1 - .../config/devstack-gate.yaml | 27 ------ .../jenkins_job_builder/config/gerrit.yaml | 15 +--- .../jenkins_job_builder/config/gitdm.yaml | 3 - .../jenkins_job_builder/config/hacking.yaml | 3 - .../jenkins_job_builder/config/hooks.yaml | 3 - .../jenkins_job_builder/config/horizon.yaml | 3 - .../config/infra-publications.yaml | 3 - .../config/jenkins-plugin-jobs.yaml | 10 +-- .../config/job-builder.yaml | 6 -- .../jenkins_job_builder/config/manuals.yaml | 83 ++++--------------- .../jenkins_job_builder/config/mirror.yaml | 8 -- .../jenkins_job_builder/config/misc.yaml | 4 - .../config/openstack-ci-puppet.yaml | 9 -- .../config/openstack-planet.yaml | 3 - .../config/openstack-publish-jobs.yaml | 3 - .../config/openstack-qa.yaml | 3 - .../config/puppet-module-jobs.yaml | 9 -- .../jenkins_job_builder/config/pypi-jobs.yaml | 3 - .../config/python-jobs.yaml | 30 ------- .../config/requirements.yaml | 3 - .../config/translation-jobs.yaml | 6 -- .../jenkins_job_builder/config/zuul.yaml | 6 -- .../openstack_project/manifests/zuul_prod.pp | 25 +++--- 26 files changed, 44 insertions(+), 295 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml index 2c3ebf0527..d8df6ff30e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml @@ -4,7 +4,7 @@ name: openstack-api-programming project-type: maven concurrent: true - node: precise && !jclouds + node: precise wrappers: - timeout: @@ -12,9 +12,6 @@ fail: true - timestamps - triggers: - - zuul-post - prebuilders: - gerrit-git-prep - markdown-docbook: @@ -47,10 +44,7 @@ name: openstack-api-quick-start project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -78,10 +72,7 @@ name: openstack-api-ref project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -112,9 +103,6 @@ concurrent: false node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep @@ -131,7 +119,7 @@ name: image-api-v2.0 project-type: maven concurrent: true - node: precise && !jclouds + node: precise wrappers: - timeout: @@ -139,9 +127,6 @@ fail: true - timestamps - triggers: - - zuul-post - prebuilders: - gerrit-git-prep - markdown-docbook: @@ -175,10 +160,7 @@ name: network-api-v1.0 project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -203,10 +185,7 @@ - job: name: netconn-api-v2.0 project-type: maven - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -232,10 +211,7 @@ name: object-api-v1.0 project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -261,10 +237,7 @@ name: compute-api-v2.0 project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -291,9 +264,6 @@ concurrent: false node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep - 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 project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -341,10 +308,7 @@ name: identity-api-v2.0 project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -371,10 +335,7 @@ name: image-api-v1.1 project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep diff --git a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml index f119e0a77b..e3df24ce34 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml @@ -2,9 +2,6 @@ name: 'gate-{name}-chef-unit' node: '{node}' - triggers: - - zuul - builders: - gerrit-git-prep - chef-cookbook-prep @@ -17,9 +14,6 @@ name: 'gate-{name}-chef-lint' node: '{node}' - triggers: - - zuul - builders: - gerrit-git-prep - chef-cookbook-prep @@ -32,9 +26,6 @@ name: 'gate-{name}-chef-style' node: '{node}' - triggers: - - zuul - builders: - gerrit-git-prep - chef-cookbook-prep diff --git a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml b/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml index bb1185bb56..4c07636f01 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml @@ -1,6 +1,5 @@ - defaults: name: global - zuul-url: http://zuul.openstack.org:8001/jenkins_endpoint description: |

This job is managed by puppet and will be overwritten.

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 9fbd2d21bd..0963a76e0c 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -14,9 +14,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout @@ -50,9 +47,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout @@ -87,9 +81,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout @@ -124,9 +115,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout @@ -161,9 +149,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout @@ -473,9 +458,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout @@ -512,9 +494,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout @@ -549,9 +528,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout @@ -587,9 +563,6 @@ description: Label of node to use for this build default: devstack-precise - triggers: - - zuul - builders: - devstack-inprogress - devstack-checkout diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml index 72ffbc5fa8..b51a14a028 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml @@ -1,7 +1,7 @@ - job: name: check-gerrit-unittests project-type: maven - node: precise && !jclouds + node: precise wrappers: - timeout: @@ -9,9 +9,6 @@ fail: true - timestamps - triggers: - - zuul - prebuilders: - gerrit-git-prep - gerrit-preclean @@ -37,7 +34,7 @@ - job: name: gate-gerrit-unittests project-type: maven - node: precise && !jclouds + node: precise wrappers: - timeout: @@ -45,9 +42,6 @@ fail: true - timestamps - triggers: - - zuul - prebuilders: - gerrit-git-prep - gerrit-preclean @@ -68,7 +62,7 @@ - job: name: gerrit-package project-type: maven - node: precise && !jclouds + node: precise wrappers: - timeout: @@ -76,9 +70,6 @@ fail: true - timestamps - triggers: - - zuul-post - prebuilders: - gerrit-git-prep - gerrit-preclean diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml index daccb62622..66a79efe94 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml @@ -2,9 +2,6 @@ name: gate-gitdm node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: | diff --git a/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml b/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml index 92096e6a06..259442a87a 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml @@ -2,9 +2,6 @@ name: gate-hacking-integration-{target-project} node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: | diff --git a/modules/openstack_project/files/jenkins_job_builder/config/hooks.yaml b/modules/openstack_project/files/jenkins_job_builder/config/hooks.yaml index cf26c87951..ef0f057637 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/hooks.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/hooks.yaml @@ -2,8 +2,5 @@ name: 'hook-{name}-rtfd' node: precise - triggers: - - zuul-post - builders: - shell: 'curl -X POST https://readthedocs.org/build/{rtfd-id} >/dev/null' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml index 6847773bf6..53edf0dc34 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml @@ -2,9 +2,6 @@ name: gate-horizon-selenium node: precise - triggers: - - zuul - builders: - gerrit-git-prep - selenium: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml b/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml index e250cc025b..b7e474d520 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml @@ -4,9 +4,6 @@ concurrent: false node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml index a849a26663..0a3492ecc9 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml @@ -1,10 +1,7 @@ - job-template: name: 'gate-{name}-build' project-type: maven - node: precise && !jclouds - - triggers: - - zuul + node: precise prebuilders: - gerrit-git-prep @@ -23,10 +20,7 @@ - job-template: name: '{name}-hpi-artifact' project-type: maven - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep diff --git a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml index 43a717acb6..65ed7bd444 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml @@ -3,9 +3,6 @@ name: jenkins-job-builder-docs node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep - docs: @@ -25,9 +22,6 @@ name: jenkins-job-builder-compare-xml node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: "./tools/run-compare-xml.sh" diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml index 880b960547..d40beec40b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -1,10 +1,7 @@ - job: name: gate-openstack-manuals-cli-guide project-type: maven - node: precise && !jclouds - - triggers: - - zuul + node: precise prebuilders: - gerrit-git-prep @@ -30,10 +27,7 @@ - job: name: gate-openstack-manuals-operations-guide project-type: maven - node: precise && !jclouds - - triggers: - - zuul + node: precise prebuilders: - gerrit-git-prep @@ -60,9 +54,6 @@ name: gate-openstack-manuals-validate node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: "./tools/validate.py" @@ -73,10 +64,7 @@ - job: name: openstack-cli-guide project-type: maven - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -101,10 +89,7 @@ - job: name: openstack-basic-install-fedora project-type: maven - node: precise && !jclouds - - triggers: - - zuul-post + node: precise properties: - inject: @@ -134,10 +119,7 @@ - job: name: openstack-basic-install-ubuntu project-type: maven - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -170,10 +152,7 @@ - job: name: openstack-admin-manual-block project-type: maven - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -203,10 +182,7 @@ - job: name: openstack-glossary project-type: maven - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -232,10 +208,7 @@ name: openstack-image-guide project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -266,10 +239,7 @@ name: openstack-admin-manual-compute project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -300,10 +270,7 @@ name: openstack-admin-manual-netconn project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -334,10 +301,7 @@ name: openstack-admin-manual-object project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise prebuilders: - gerrit-git-prep @@ -368,10 +332,7 @@ - job: name: openstack-docs-site concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise builders: - gerrit-git-prep @@ -395,10 +356,7 @@ name: openstack-ha-guide project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise properties: - inject: @@ -431,10 +389,7 @@ name: openstack-install-deploy-guide-apt-fedora project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise properties: - inject: @@ -465,10 +420,7 @@ name: openstack-install-deploy-guide-ubuntu project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise properties: - inject: @@ -499,10 +451,7 @@ name: openstack-operations-guide project-type: maven concurrent: false - node: precise && !jclouds - - triggers: - - zuul-post + node: precise properties: - inject: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml index 794e48b9ee..6a4f8bc3fc 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml @@ -11,7 +11,6 @@ triggers: - timed: '4 21 * * *' - - zuul builders: - update-pypi-mirror @@ -32,9 +31,6 @@ fail: true - timestamps - triggers: - - zuul - builders: - update-pypi-mirror @@ -56,7 +52,6 @@ triggers: - timed: '12 21 * * *' - - zuul builders: - update-pypi-mirror @@ -77,9 +72,6 @@ fail: true - timestamps - triggers: - - zuul - builders: - update-pypi-mirror diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml index 0fb71507e4..4edb6175ad 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml @@ -1,7 +1,3 @@ - job: name: gate-noop - - triggers: - - zuul - node: precise diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml index 4971077aad..fd058fe5be 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml @@ -2,9 +2,6 @@ name: config-compare-xml node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: "./tools/run-compare-xml.sh openstack-infra config" @@ -17,9 +14,6 @@ name: gate-config-layout node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: "./tools/run-layout.sh openstack-infra config" @@ -33,9 +27,6 @@ name: ci-docs node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep - docs: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-planet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-planet.yaml index 56bac763e6..a49f87577a 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-planet.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-planet.yaml @@ -3,9 +3,6 @@ name: 'gate-openstack-planet-unittest' node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: | diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml index 741a8affd5..18ac872794 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml @@ -2,9 +2,6 @@ name: '{name}-docs' node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep - docs: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml index fb8d6c1901..832830449c 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-qa.yaml @@ -4,9 +4,6 @@ name: openstack-qa-docs node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep - shell: | diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml index 4b05d6080c..e91c993356 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml @@ -2,9 +2,6 @@ name: 'gate-{name}-puppet-unit-{puppet_version}' node: '{node}' - triggers: - - zuul - builders: - gerrit-git-prep - shell: | @@ -21,9 +18,6 @@ name: 'gate-{name}-puppet-lint' node: '{node}' - triggers: - - zuul - builders: - gerrit-git-prep - puppet-lint @@ -35,9 +29,6 @@ name: 'gate-{name}-puppet-syntax' node: '{node}' - triggers: - - zuul - builders: - gerrit-git-prep - puppet-syntax diff --git a/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml index 239bc8fb64..4b838ed795 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml @@ -2,9 +2,6 @@ name: '{name}-pypi-upload' node: pypi - triggers: - - zuul-post - builders: - shell: | #!/bin/bash -xe diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml index e16b4c5b78..3e119c27a9 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml @@ -7,9 +7,6 @@ fail: true - timestamps - triggers: - - zuul-post - builders: - gerrit-git-prep - coverage: @@ -26,9 +23,6 @@ - job-template: name: 'gate-{name}-pep8' - triggers: - - zuul - builders: - gerrit-git-prep - pep8: @@ -45,9 +39,6 @@ - job-template: name: 'gate-{name}-pylint' - triggers: - - zuul - builders: - gerrit-git-prep - pylint: @@ -70,9 +61,6 @@ fail: true - timestamps - triggers: - - zuul - builders: - gerrit-git-prep - python26: @@ -119,9 +107,6 @@ description: Label of node to use for this build default: '{node}' - triggers: - - zuul - builders: - gerrit-git-prep - python27: @@ -156,9 +141,6 @@ - job-template: name: 'gate-{name}-docs' - triggers: - - zuul - builders: - gerrit-git-prep - docs: @@ -182,9 +164,6 @@ name: 'gate-{name}-pyflakes' node: precise - triggers: - - zuul - builders: - gerrit-git-prep - pyflakes: @@ -199,9 +178,6 @@ name: '{name}-tarball' node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep - tarball: @@ -220,9 +196,6 @@ concurrent: false node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep - tarball: @@ -245,9 +218,6 @@ name: 'gate-{name}-requirements' node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: | diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index d4bbdc33fe..d3262e35ce 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -2,9 +2,6 @@ name: gate-requirements-install node: precise - triggers: - - zuul - builders: - gerrit-git-prep - shell: | diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml index 7855c65e0e..43cc830244 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml @@ -2,9 +2,6 @@ name: '{name}-upstream-translation-update' concurrent: false - triggers: - - zuul-post - builders: - gerrit-git-prep - shell: | @@ -43,9 +40,6 @@ name: manuals-upstream-translation-update concurrent: false - triggers: - - zuul-post - builders: - gerrit-git-prep - shell: | diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml index 80ee19ea4c..c137e7a69f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml @@ -3,9 +3,6 @@ name: zuul-docs node: precise - triggers: - - zuul-post - builders: - gerrit-git-prep - docs: @@ -25,9 +22,6 @@ name: 'dev-zuul-coverage' node: precise - triggers: - - zuul - builders: - gerrit-git-prep - coverage: diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp index aee60920a2..fdc08223f1 100644 --- a/modules/openstack_project/manifests/zuul_prod.pp +++ b/modules/openstack_project/manifests/zuul_prod.pp @@ -15,27 +15,17 @@ class openstack_project::zuul_prod( $gearman_workers = [] ) { # 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_rules4 = flatten ([$iptables_rules6, - [ "-m state --state NEW -m tcp -p tcp --dport 8001 -s ${jenkins_host} -j ACCEPT" ]]) + $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT') class { 'openstack_project::server': iptables_public_tcp_ports => [80], - iptables_rules6 => $iptables_rules6, - iptables_rules4 => $iptables_rules4, + iptables_rules6 => $iptables_rules, + iptables_rules4 => $iptables_rules, sysadmins => $sysadmins, } - # co-host gearman-job-server - class { 'gearman': - listen => '::', - } - class { '::zuul': vhost_name => $vhost_name, - jenkins_server => $jenkins_url, - jenkins_user => $jenkins_user, - jenkins_apikey => $jenkins_apikey, gerrit_server => $gerrit_server, gerrit_user => $gerrit_user, zuul_ssh_private_key => $zuul_ssh_private_key, @@ -43,6 +33,7 @@ class openstack_project::zuul_prod( push_change_refs => false, status_url => 'http://status.openstack.org/zuul/', statsd_host => $statsd_host, + revision => 'feature/gearman', } file { '/etc/zuul/layout.yaml': @@ -50,17 +41,25 @@ class openstack_project::zuul_prod( source => 'puppet:///modules/openstack_project/zuul/layout.yaml', notify => Exec['zuul-reload'], } + file { '/etc/zuul/openstack_functions.py': ensure => present, source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py', notify => Exec['zuul-reload'], } + file { '/etc/zuul/logging.conf': ensure => present, source => 'puppet:///modules/openstack_project/zuul/logging.conf', 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': gerrit_server => $gerrit_server, gerrit_user => $gerrit_user,