From e5dc4aed4a06812296b17dd01f58114c14d96645 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 10 Aug 2012 09:59:37 -0700 Subject: [PATCH] Standardize redundant jobs. Add logrotate to ceilometer essex jobs. Use template merge job for devstack-gate (no XML change). Use template merge job for devstack. Use template merge job for gerrit-verification-status-plugin. Use template merge job for gerrit. Use template sdist/pypi jobs for gerritbot. Use template merge job for jenkins-job-builder. Use template merge/pyflakes jobs for pypi-mirror. Use template merge job for requirements. Use template merge/pep8 jobs for tempest. Use template pyflakes job for zuul. Change-Id: I149290ae76d0f8a9ab70e6bd68e4a173ca21f789 Reviewed-on: https://review.openstack.org/11159 Reviewed-by: Monty Taylor Approved: James E. Blair Tested-by: Jenkins --- .../jenkins_job_builder/config/ceilometer.yml | 30 ++++--- .../config/devstack-gate.yml | 45 +++-------- .../jenkins_job_builder/config/devstack.yml | 38 ++------- .../gerrit-verification-status-plugin.yml | 32 +------- .../jenkins_job_builder/config/gerrit.yml | 71 +++++----------- .../jenkins_job_builder/config/gerritbot.yml | 81 +------------------ .../jenkins_job_builder/config/gerritlib.yml | 4 +- .../jenkins_job_builder/config/horizon.yml | 2 +- .../config/jenkins-job-builder.yml | 33 +------- .../jenkins_job_builder/config/macros.yml | 18 ++--- .../jenkins_job_builder/config/mraas.yml | 4 +- .../config/openstack-ci-puppet.yml | 6 +- .../config/openstack-publish-jobs.yml | 10 ++- .../jenkins_job_builder/config/pypi-jobs.yml | 9 ++- .../config/pypi-mirror.yml | 62 +------------- .../config/python-bitrot-jobs.yml | 1 + .../config/python-jobs.yml | 16 ++-- .../config/requirements.yml | 33 +------- .../jenkins_job_builder/config/tempest.yml | 67 +-------------- .../files/jenkins_job_builder/config/zuul.yml | 36 +-------- 20 files changed, 109 insertions(+), 489 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yml b/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yml index a17dbc5326..7eae11fc9b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yml @@ -26,19 +26,18 @@ option: project enabled: false - # TODO: logrotate this job - #logrotate: - # daysToKeep: 28 - # numToKeep: -1 - # artifactDaysToKeep: -1 - # artifactNumToKeep: -1 + logrotate: + daysToKeep: 28 + numToKeep: -1 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 triggers: - zuul builders: - - gerrit_git_prep - - python26_essex + - gerrit-git-prep + - python26-essex # >= precise does not have python2.6 node: oneiric @@ -63,18 +62,17 @@ option: project enabled: false - # TODO: logrotate this job - #logrotate: - # daysToKeep: 28 - # numToKeep: -1 - # artifactDaysToKeep: -1 - # artifactNumToKeep: -1 + logrotate: + daysToKeep: 28 + numToKeep: -1 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 triggers: - zuul builders: - - gerrit_git_prep - - python27_essex + - gerrit-git-prep + - python27-essex node: oneiric diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yml index c26a1fe598..dda940c64b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yml @@ -1,35 +1,10 @@ -- job: - name: gate-devstack-gate-merge - project-type: freestyle - concurrent: true +- project: + name: devstack-gate + github-org: openstack-ci node: precise - - properties: - - github: - url: https://github.com/openstack-ci/devstack-gate - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul - - builders: - - gerrit_git_prep + + jobs: + - gate-{name}-merge - job: @@ -69,7 +44,7 @@ builders: - trigger-builds: - project: devstack-update-inprogress - predefined_parameters: + predefined-parameters: DEVSTACK_NODE_NAME=${NODE_NAME} - shell: | #!/bin/bash -xe @@ -103,7 +78,7 @@ - trigger-parameterized-builds: - project: devstack-update-complete when: complete - predefined_parameters: + predefined-parameters: DEVSTACK_NODE_NAME=${NODE_NAME} @@ -144,7 +119,7 @@ builders: - trigger-builds: - project: devstack-update-inprogress - predefined_parameters: + predefined-parameters: DEVSTACK_NODE_NAME=${NODE_NAME} - shell: | #!/bin/bash -xe @@ -179,7 +154,7 @@ - trigger-parameterized-builds: - project: devstack-update-complete when: complete - predefined_parameters: + predefined-parameters: DEVSTACK_NODE_NAME=${NODE_NAME} diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack.yml b/modules/openstack_project/files/jenkins_job_builder/config/devstack.yml index e78ddf03c2..13924a3518 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack.yml @@ -1,33 +1,7 @@ -- job: - name: gate-devstack-merge - project-type: freestyle - concurrent: true +- project: + name: devstack + github-org: openstack-dev node: precise - - properties: - - github: - url: https://github.com/openstack-dev/devstack - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - # TODO: logrotate this job - #logrotate: - # daysToKeep: 28 - # numToKeep: -1 - # artifactDaysToKeep: -1 - # artifactNumToKeep: -1 - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul - - builders: - - gerrit_git_prep + + jobs: + - gate-{name}-merge diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit-verification-status-plugin.yml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit-verification-status-plugin.yml index 264a1cded7..471e22c8fe 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit-verification-status-plugin.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit-verification-status-plugin.yml @@ -3,33 +3,5 @@ github-org: openstack-ci node: precise - # TODO: standardize - #jobs: - #- gate-{name}-merge - -- job: - name: gate-gerrit-verification-status-plugin-merge - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: https://github.com/openstack-ci/gerrit-verification-status-plugin - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - triggers: - - zuul - - builders: - - gerrit_git_prep - - node: precise + jobs: + - gate-{name}-merge diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yml index 3f200cc284..4c8cc88026 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yml @@ -3,37 +3,8 @@ github-org: openstack-ci node: precise - # TODO: standardize - #jobs: - # - gate-{name}-merge - - -- job: - name: gate-gerrit-merge - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: https://github.com/openstack-ci/gerrit - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - triggers: - - zuul - - builders: - - gerrit_git_prep - - node: precise + jobs: + - gate-{name}-merge - job: @@ -60,17 +31,17 @@ - zuul prebuilders: - - gerrit_git_prep - - gerrit_preclean + - gerrit-git-prep + - gerrit-preclean maven: - root_module: - group_id: com.google.gerrit - artifact_id: gerrit-parent + root-module: + group-id: com.google.gerrit + artifact-id: gerrit-parent goals: 'clean package -Dgerrit.include-documentation=1 -X' postbuilders: - - gerrit_postrun + - gerrit-postrun publishers: - war: @@ -103,17 +74,17 @@ - zuul prebuilders: - - gerrit_git_prep - - gerrit_preclean + - gerrit-git-prep + - gerrit-preclean maven: - root_module: - group_id: com.google.gerrit - artifact_id: gerrit-parent + root-module: + group-id: com.google.gerrit + artifact-id: gerrit-parent goals: 'clean package -Dgerrit.include-documentation=1 -X' postbuilders: - - gerrit_postrun + - gerrit-postrun - job: @@ -137,20 +108,20 @@ enabled: false triggers: - - zuul_post + - zuul-post prebuilders: - - gerrit_git_prep - - gerrit_preclean + - gerrit-git-prep + - gerrit-preclean maven: - root_module: - group_id: com.google.gerrit - artifact_id: gerrit-parent + root-module: + group-id: com.google.gerrit + artifact-id: gerrit-parent goals: 'clean package -Dgerrit.include-documentation=1 -X' postbuilders: - - gerrit_postrun + - gerrit-postrun publishers: - war: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerritbot.yml b/modules/openstack_project/files/jenkins_job_builder/config/gerritbot.yml index b5ba6b3804..572a748df2 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerritbot.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerritbot.yml @@ -9,82 +9,5 @@ - gate-{name}-merge - gate-{name}-pep8 - gate-{name}-pyflakes - # TODO: standardize - #- '{name}-sdist-tarball' - #- '{name}-pypi' - -- job: - name: 'gerritbot-sdist-tarball' - project-type: freestyle - concurrent: true - node: precise - - properties: - - github: - url: 'https://github.com/openstack-ci/gerritbot' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - triggers: - - zuul_post - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - builders: - - gerrit_git_prep - - shell: | - #!/bin/bash -xe - BRANCH=$GERRIT_REFNAME - BRANCH_PATH=`echo $BRANCH | tr / -` - - tox -v -evenv python setup.py sdist - cp dist/* dist/gerritbot-$BRANCH_PATH.tar.gz - - publishers: - - tarball: - project: 'gerritbot' - site: 'ci.openstack.org' - - -- job: - name: 'gerritbot-pypi' - concurrent: true - node: pypi - - properties: - - github: - url: 'https://github.com/openstack-ci/gerritbot' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - triggers: - - zuul_post - - builders: - - gerrit_git_prep - - shell: tox -v -evenv python setup.py sdist upload - - publishers: - - tarball: - project: 'gerritbot' - site: 'ci.openstack.org' + - '{name}-sdist-tarball' + - '{name}-pypi' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerritlib.yml b/modules/openstack_project/files/jenkins_job_builder/config/gerritlib.yml index 1e775c9e50..416d772693 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerritlib.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerritlib.yml @@ -33,10 +33,10 @@ - timestamps triggers: - - zuul_post + - zuul-post builders: - - gerrit_git_prep + - gerrit-git-prep - shell: tox -v -evenv python setup.py sdist upload publishers: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yml b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yml index 92970a1b70..6e73ecb2e7 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yml @@ -39,5 +39,5 @@ - zuul builders: - - gerrit_git_prep + - gerrit-git-prep - selenium diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-job-builder.yml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-job-builder.yml index 29f3952949..8b0c9b3f7f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-job-builder.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-job-builder.yml @@ -1,34 +1,7 @@ - project: name: jenkins-job-builder - github-org: openstack + github-org: openstack-ci node: precise - # TODO: standardize - #jobs: - # - gate-{name}-merge - -- job: - name: gate-jenkins-job-builder-merge - concurrent: true - node: precise - - properties: - - github: - url: https://github.com/openstack-ci/jenkins-job-builder - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul - - builders: - - gerrit_git_prep + jobs: + - gate-{name}-merge diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yml index 8af5dcad1a..9e628ffd96 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yml @@ -1,5 +1,5 @@ - builder: - name: gerrit_git_prep + name: gerrit-git-prep builders: - shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh review.openstack.org" @@ -14,28 +14,28 @@ - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh" - builder: - name: maven_test + name: maven-test builders: - shell: "mvn test" - builder: - name: maven_package + name: maven-package builders: - shell: "mvn package" - builder: - name: gerrit_package + name: gerrit-package builders: - shell: "/usr/local/jenkins/slave_scripts/package-gerrit.sh" - builder: - name: gerrit_preclean + name: gerrit-preclean #TODO: multiline: builders: - shell: "#!/bin/bash -xe\nrm -fr ~/.m2\nrm -fr ~/.java\n./tools/version.sh --release" - builder: - name: gerrit_postrun + name: gerrit-postrun builders: - shell: "./tools/version.sh --reset" @@ -50,7 +50,7 @@ - shell: "tox -v -epyflakes" - builder: - name: puppet_syntax + name: puppet-syntax builders: # TODO: remove blank line - shell: | @@ -78,12 +78,12 @@ - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27" - builder: - name: python26_essex + name: python26-essex builders: - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-essex" - builder: - name: python27_essex + name: python27-essex builders: - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-essex" diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mraas.yml b/modules/openstack_project/files/jenkins_job_builder/config/mraas.yml index e148cef2c5..78f8b87adc 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/mraas.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/mraas.yml @@ -39,7 +39,7 @@ branchPattern: '**' builders: - - gerrit_git_prep + - gerrit-git-prep - job: @@ -79,4 +79,4 @@ branchPattern: '**' builders: - - gerrit_git_prep + - gerrit-git-prep diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml index 6680390617..b2046e9a4f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml @@ -31,7 +31,7 @@ - zuul builders: - - gerrit_git_prep + - gerrit-git-prep - job: @@ -58,6 +58,6 @@ - zuul builders: - - gerrit_git_prep - - puppet_syntax + - gerrit-git-prep + - puppet-syntax - pyflakes diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yml index a78c53f35e..c06fd547d6 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yml @@ -20,7 +20,7 @@ - timestamps triggers: - - zuul_post + - zuul-post logrotate: daysToKeep: 28 @@ -29,7 +29,7 @@ artifactNumToKeep: -1 builders: - - gerrit_git_prep + - gerrit-git-prep - docs publishers: @@ -40,6 +40,7 @@ remove-prefix: 'doc/build/html' excludes: '' + - job-template: name: '{name}-tarball' project-type: freestyle @@ -62,7 +63,7 @@ - timestamps triggers: - - zuul_post + - zuul-post logrotate: daysToKeep: 28 @@ -71,7 +72,7 @@ artifactNumToKeep: -1 builders: - - gerrit_git_prep + - gerrit-git-prep - tarball: project: '{name}' @@ -80,6 +81,7 @@ project: '{name}' site: '{tarball-publisher-site}' + - job-group: name: openstack-publish-jobs jobs: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yml b/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yml index 68fc96559e..436a954203 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yml @@ -20,7 +20,7 @@ - timestamps triggers: - - zuul_post + - zuul-post logrotate: daysToKeep: 28 @@ -29,7 +29,7 @@ artifactNumToKeep: -1 builders: - - gerrit_git_prep + - gerrit-git-prep - shell: | #!/bin/bash -xe BRANCH=$GERRIT_REFNAME @@ -66,10 +66,10 @@ - timestamps triggers: - - zuul_post + - zuul-post builders: - - gerrit_git_prep + - gerrit-git-prep - shell: tox -v -evenv python setup.py sdist upload publishers: @@ -77,6 +77,7 @@ project: '{name}' site: '{tarball-publisher-site}' + - job-group: name: pypi-jobs jobs: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/pypi-mirror.yml b/modules/openstack_project/files/jenkins_job_builder/config/pypi-mirror.yml index bed7e5808b..8bb7cb6a53 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/pypi-mirror.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/pypi-mirror.yml @@ -3,62 +3,6 @@ github-org: openstack-ci node: precise - # TODO: standardize - #jobs: - # - gate-{name}-merge - # - gate-{name}-pyflakes - -- job: - name: gate-pypi-mirror-merge - project-type: freestyle - concurrent: true - node: precise - - properties: - - github: - url: https://github.com/openstack-ci/pypi-mirror - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul - - builders: - - gerrit_git_prep - -- job: - name: gate-pypi-mirror-pyflakes - project-type: freestyle - concurrent: true - node: precise - - properties: - - github: - url: https://github.com/openstack-ci/pypi-mirror - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul - - builders: - - gerrit_git_prep - - pyflakes + jobs: + - gate-{name}-merge + - gate-{name}-pyflakes diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yml index 5b1d6fc221..77e508c962 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yml @@ -129,6 +129,7 @@ - 'periodic-{name}-python27-{branch-name}' - 'periodic-{name}-docs-{branch-name}' + - job-group: name: python-essex-bitrot-jobs branch: 'stable/essex' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yml index 20233bb8d0..55c245899b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yml @@ -24,10 +24,10 @@ artifactNumToKeep: -1 triggers: - - zuul_post + - zuul-post builders: - - gerrit_git_prep + - gerrit-git-prep - coverage publishers: @@ -65,7 +65,7 @@ - zuul builders: - - gerrit_git_prep + - gerrit-git-prep - pep8 publishers: @@ -103,7 +103,7 @@ - zuul builders: - - gerrit_git_prep + - gerrit-git-prep - python26 # >= precise does not have python2.6 @@ -145,7 +145,7 @@ - zuul builders: - - gerrit_git_prep + - gerrit-git-prep - python27 node: '{node}' @@ -180,7 +180,7 @@ - zuul builders: - - gerrit_git_prep + - gerrit-git-prep node: '{node}' @@ -214,7 +214,7 @@ - zuul builders: - - gerrit_git_prep + - gerrit-git-prep - docs node: '{node}' @@ -251,7 +251,7 @@ - zuul builders: - - gerrit_git_prep + - gerrit-git-prep - pyflakes diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yml index c0c01a9428..f936cf785e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yml @@ -1,34 +1,7 @@ - project: name: requirements github-org: openstack - node: oneiric - - # TODO: standardize - #jobs: - # - gate-{name}-merge - -- job: - name: gate-requirements-merge - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - properties: - - github: - url: https://github.com/openstack/requirements - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - triggers: - - zuul - - builders: - - gerrit_git_prep - node: precise + + jobs: + - gate-{name}-merge diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tempest.yml b/modules/openstack_project/files/jenkins_job_builder/config/tempest.yml index 4f4739b0a7..9e32d1c9eb 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/tempest.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/tempest.yml @@ -1,67 +1,8 @@ - project: name: tempest - github-org: openstack + github-org: openstack-ci node: precise - # TODO: standardize - #jobs: - # - gate-{name}-merge - # - gate-{name}-pep8 - -- job: - name: gate-tempest-merge - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: https://github.com/openstack-ci/tempest - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - triggers: - - zuul - - builders: - - gerrit_git_prep - - node: precise - -- job: - name: gate-tempest-pep8 - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: https://github.com/openstack-ci/tempest - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - triggers: - - zuul - - builders: - - gerrit_git_prep - - pep8 - - publishers: - - pep8 - - node: precise + jobs: + - gate-{name}-merge + - gate-{name}-pep8 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yml b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yml index bbe44c0b6d..5ea95b6270 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yml +++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yml @@ -4,38 +4,10 @@ node: precise jobs: - python-jobs - # TODO: standardize these - #- gate-{name}-pyflakes + - gate-{name}-pyflakes + # TODO: standardize this #- '{name}-docs -- job: - name: gate-zuul-pyflakes - project-type: freestyle - concurrent: true - node: precise - - properties: - - github: - url: https://github.com/openstack-ci/zuul - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul - - builders: - - gerrit_git_prep - - pyflakes - - job: name: zuul-docs @@ -59,7 +31,7 @@ - timestamps triggers: - - zuul_post + - zuul-post logrotate: daysToKeep: 28 @@ -68,7 +40,7 @@ artifactNumToKeep: -1 builders: - - gerrit_git_prep + - gerrit-git-prep - docs publishers: