opendev/system-config
Code Issues Proposed changes

Standardize redundant jobs.

Browse Source 
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 <mordred@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-08-10 09:59:37 -07:00 committed by Jenkins
parent 7de3719c8f
commit e5dc4aed4a
20 changed files with 109 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yml
View File

@ -26,19 +26,18 @@
option: project option: project
enabled: false enabled: false
# TODO: logrotate this job logrotate:
#logrotate: daysToKeep: 28
# daysToKeep: 28 numToKeep: -1
# numToKeep: -1 artifactDaysToKeep: -1
# artifactDaysToKeep: -1 artifactNumToKeep: -1
# artifactNumToKeep: -1
triggers: triggers:
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- python26_essex - python26-essex
# >= precise does not have python2.6 # >= precise does not have python2.6
node: oneiric node: oneiric
@ -63,18 +62,17 @@
option: project option: project
enabled: false enabled: false
# TODO: logrotate this job logrotate:
#logrotate: daysToKeep: 28
# daysToKeep: 28 numToKeep: -1
# numToKeep: -1 artifactDaysToKeep: -1
# artifactDaysToKeep: -1 artifactNumToKeep: -1
# artifactNumToKeep: -1
triggers: triggers:
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- python27_essex - python27-essex
node: oneiric node: oneiric

45
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yml
View File

@ -1,35 +1,10 @@
- job: - project:
name: gate-devstack-gate-merge name: devstack-gate
project-type: freestyle github-org: openstack-ci
concurrent: true
node: precise node: precise
properties: jobs:
- github: - gate-{name}-merge
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
- job: - job:
@ -69,7 +44,7 @@
builders: builders:
- trigger-builds: - trigger-builds:
- project: devstack-update-inprogress - project: devstack-update-inprogress
predefined_parameters: predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME} DEVSTACK_NODE_NAME=${NODE_NAME}
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -103,7 +78,7 @@
- trigger-parameterized-builds: - trigger-parameterized-builds:
- project: devstack-update-complete - project: devstack-update-complete
when: complete when: complete
predefined_parameters: predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME} DEVSTACK_NODE_NAME=${NODE_NAME}
@ -144,7 +119,7 @@
builders: builders:
- trigger-builds: - trigger-builds:
- project: devstack-update-inprogress - project: devstack-update-inprogress
predefined_parameters: predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME} DEVSTACK_NODE_NAME=${NODE_NAME}
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -179,7 +154,7 @@
- trigger-parameterized-builds: - trigger-parameterized-builds:
- project: devstack-update-complete - project: devstack-update-complete
when: complete when: complete
predefined_parameters: predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME} DEVSTACK_NODE_NAME=${NODE_NAME}

38
modules/openstack_project/files/jenkins_job_builder/config/devstack.yml
View File

@ -1,33 +1,7 @@
- job: - project:
name: gate-devstack-merge name: devstack
project-type: freestyle github-org: openstack-dev
concurrent: true
node: precise node: precise
properties: jobs:
- github: - gate-{name}-merge
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

32
modules/openstack_project/files/jenkins_job_builder/config/gerrit-verification-status-plugin.yml
View File

@ -3,33 +3,5 @@
github-org: openstack-ci github-org: openstack-ci
node: precise node: precise
# TODO: standardize jobs:
#jobs: - gate-{name}-merge
#- 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

71
modules/openstack_project/files/jenkins_job_builder/config/gerrit.yml
View File

@ -3,37 +3,8 @@
github-org: openstack-ci github-org: openstack-ci
node: precise node: precise
# TODO: standardize jobs:
#jobs: - gate-{name}-merge
# - 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
- job: - job:
@ -60,17 +31,17 @@
- zuul - zuul
prebuilders: prebuilders:
- gerrit_git_prep - gerrit-git-prep
- gerrit_preclean - gerrit-preclean
maven: maven:
root_module: root-module:
group_id: com.google.gerrit group-id: com.google.gerrit
artifact_id: gerrit-parent artifact-id: gerrit-parent
goals: 'clean package -Dgerrit.include-documentation=1 -X' goals: 'clean package -Dgerrit.include-documentation=1 -X'
postbuilders: postbuilders:
- gerrit_postrun - gerrit-postrun
publishers: publishers:
- war: - war:
@ -103,17 +74,17 @@
- zuul - zuul
prebuilders: prebuilders:
- gerrit_git_prep - gerrit-git-prep
- gerrit_preclean - gerrit-preclean
maven: maven:
root_module: root-module:
group_id: com.google.gerrit group-id: com.google.gerrit
artifact_id: gerrit-parent artifact-id: gerrit-parent
goals: 'clean package -Dgerrit.include-documentation=1 -X' goals: 'clean package -Dgerrit.include-documentation=1 -X'
postbuilders: postbuilders:
- gerrit_postrun - gerrit-postrun
- job: - job:
@ -137,20 +108,20 @@
enabled: false enabled: false
triggers: triggers:
- zuul_post - zuul-post
prebuilders: prebuilders:
- gerrit_git_prep - gerrit-git-prep
- gerrit_preclean - gerrit-preclean
maven: maven:
root_module: root-module:
group_id: com.google.gerrit group-id: com.google.gerrit
artifact_id: gerrit-parent artifact-id: gerrit-parent
goals: 'clean package -Dgerrit.include-documentation=1 -X' goals: 'clean package -Dgerrit.include-documentation=1 -X'
postbuilders: postbuilders:
- gerrit_postrun - gerrit-postrun
publishers: publishers:
- war: - war:

81
modules/openstack_project/files/jenkins_job_builder/config/gerritbot.yml
View File

@ -9,82 +9,5 @@
- gate-{name}-merge - gate-{name}-merge
- gate-{name}-pep8 - gate-{name}-pep8
- gate-{name}-pyflakes - gate-{name}-pyflakes
# TODO: standardize - '{name}-sdist-tarball'
#- '{name}-sdist-tarball' - '{name}-pypi'
#- '{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'

4
modules/openstack_project/files/jenkins_job_builder/config/gerritlib.yml
View File

@ -33,10 +33,10 @@
- timestamps - timestamps
triggers: triggers:
- zuul_post - zuul-post
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- shell: tox -v -evenv python setup.py sdist upload - shell: tox -v -evenv python setup.py sdist upload
publishers: publishers:

2
modules/openstack_project/files/jenkins_job_builder/config/horizon.yml
View File

@ -39,5 +39,5 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- selenium - selenium

33
modules/openstack_project/files/jenkins_job_builder/config/jenkins-job-builder.yml
View File

@ -1,34 +1,7 @@
- project: - project:
name: jenkins-job-builder name: jenkins-job-builder
github-org: openstack github-org: openstack-ci
node: precise node: precise
# TODO: standardize jobs:
#jobs: - gate-{name}-merge
# - 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

18
modules/openstack_project/files/jenkins_job_builder/config/macros.yml
View File

@ -1,5 +1,5 @@
- builder: - builder:
name: gerrit_git_prep name: gerrit-git-prep
builders: builders:
- shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh review.openstack.org" - 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" - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh"
- builder: - builder:
name: maven_test name: maven-test
builders: builders:
- shell: "mvn test" - shell: "mvn test"
- builder: - builder:
name: maven_package name: maven-package
builders: builders:
- shell: "mvn package" - shell: "mvn package"
- builder: - builder:
name: gerrit_package name: gerrit-package
builders: builders:
- shell: "/usr/local/jenkins/slave_scripts/package-gerrit.sh" - shell: "/usr/local/jenkins/slave_scripts/package-gerrit.sh"
- builder: - builder:
name: gerrit_preclean name: gerrit-preclean
#TODO: multiline: #TODO: multiline:
builders: builders:
- shell: "#!/bin/bash -xe\nrm -fr ~/.m2\nrm -fr ~/.java\n./tools/version.sh --release" - shell: "#!/bin/bash -xe\nrm -fr ~/.m2\nrm -fr ~/.java\n./tools/version.sh --release"
- builder: - builder:
name: gerrit_postrun name: gerrit-postrun
builders: builders:
- shell: "./tools/version.sh --reset" - shell: "./tools/version.sh --reset"
@ -50,7 +50,7 @@
- shell: "tox -v -epyflakes" - shell: "tox -v -epyflakes"
- builder: - builder:
name: puppet_syntax name: puppet-syntax
builders: builders:
# TODO: remove blank line # TODO: remove blank line
- shell: | - shell: |
@ -78,12 +78,12 @@
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27" - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27"
- builder: - builder:
name: python26_essex name: python26-essex
builders: builders:
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-essex" - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-essex"
- builder: - builder:
name: python27_essex name: python27-essex
builders: builders:
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-essex" - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-essex"

4
modules/openstack_project/files/jenkins_job_builder/config/mraas.yml
View File

@ -39,7 +39,7 @@
branchPattern: '**' branchPattern: '**'
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- job: - job:
@ -79,4 +79,4 @@
branchPattern: '**' branchPattern: '**'
builders: builders:
- gerrit_git_prep - gerrit-git-prep

6
modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yml
View File

@ -31,7 +31,7 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- job: - job:
@ -58,6 +58,6 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- puppet_syntax - puppet-syntax
- pyflakes - pyflakes

10
modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yml
View File

@ -20,7 +20,7 @@
- timestamps - timestamps
triggers: triggers:
- zuul_post - zuul-post
logrotate: logrotate:
daysToKeep: 28 daysToKeep: 28
@ -29,7 +29,7 @@
artifactNumToKeep: -1 artifactNumToKeep: -1
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- docs - docs
publishers: publishers:
@ -40,6 +40,7 @@
remove-prefix: 'doc/build/html' remove-prefix: 'doc/build/html'
excludes: '' excludes: ''
- job-template: - job-template:
name: '{name}-tarball' name: '{name}-tarball'
project-type: freestyle project-type: freestyle
@ -62,7 +63,7 @@
- timestamps - timestamps
triggers: triggers:
- zuul_post - zuul-post
logrotate: logrotate:
daysToKeep: 28 daysToKeep: 28
@ -71,7 +72,7 @@
artifactNumToKeep: -1 artifactNumToKeep: -1
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- tarball: - tarball:
project: '{name}' project: '{name}'
@ -80,6 +81,7 @@
project: '{name}' project: '{name}'
site: '{tarball-publisher-site}' site: '{tarball-publisher-site}'
- job-group: - job-group:
name: openstack-publish-jobs name: openstack-publish-jobs
jobs: jobs:

9
modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yml
View File

@ -20,7 +20,7 @@
- timestamps - timestamps
triggers: triggers:
- zuul_post - zuul-post
logrotate: logrotate:
daysToKeep: 28 daysToKeep: 28
@ -29,7 +29,7 @@
artifactNumToKeep: -1 artifactNumToKeep: -1
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
BRANCH=$GERRIT_REFNAME BRANCH=$GERRIT_REFNAME
@ -66,10 +66,10 @@
- timestamps - timestamps
triggers: triggers:
- zuul_post - zuul-post
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- shell: tox -v -evenv python setup.py sdist upload - shell: tox -v -evenv python setup.py sdist upload
publishers: publishers:
@ -77,6 +77,7 @@
project: '{name}' project: '{name}'
site: '{tarball-publisher-site}' site: '{tarball-publisher-site}'
- job-group: - job-group:
name: pypi-jobs name: pypi-jobs
jobs: jobs:

62
modules/openstack_project/files/jenkins_job_builder/config/pypi-mirror.yml
View File

@ -3,62 +3,6 @@
github-org: openstack-ci github-org: openstack-ci
node: precise node: precise
# TODO: standardize jobs:
#jobs: - gate-{name}-merge
# - gate-{name}-merge - gate-{name}-pyflakes
# - 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

1
modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yml
View File

@ -129,6 +129,7 @@
- 'periodic-{name}-python27-{branch-name}' - 'periodic-{name}-python27-{branch-name}'
- 'periodic-{name}-docs-{branch-name}' - 'periodic-{name}-docs-{branch-name}'
- job-group: - job-group:
name: python-essex-bitrot-jobs name: python-essex-bitrot-jobs
branch: 'stable/essex' branch: 'stable/essex'

16
modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yml
View File

@ -24,10 +24,10 @@
artifactNumToKeep: -1 artifactNumToKeep: -1
triggers: triggers:
- zuul_post - zuul-post
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- coverage - coverage
publishers: publishers:
@ -65,7 +65,7 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- pep8 - pep8
publishers: publishers:
@ -103,7 +103,7 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- python26 - python26
# >= precise does not have python2.6 # >= precise does not have python2.6
@ -145,7 +145,7 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- python27 - python27
node: '{node}' node: '{node}'
@ -180,7 +180,7 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
node: '{node}' node: '{node}'
@ -214,7 +214,7 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- docs - docs
node: '{node}' node: '{node}'
@ -251,7 +251,7 @@
- zuul - zuul
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- pyflakes - pyflakes

33
modules/openstack_project/files/jenkins_job_builder/config/requirements.yml
View File

@ -1,34 +1,7 @@
- project: - project:
name: requirements name: requirements
github-org: openstack 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 node: precise
jobs:
- gate-{name}-merge

67
modules/openstack_project/files/jenkins_job_builder/config/tempest.yml
View File

@ -1,67 +1,8 @@
- project: - project:
name: tempest name: tempest
github-org: openstack github-org: openstack-ci
node: precise node: precise
# TODO: standardize jobs:
#jobs: - gate-{name}-merge
# - gate-{name}-merge - gate-{name}-pep8
# - 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

36
modules/openstack_project/files/jenkins_job_builder/config/zuul.yml
View File

@ -4,38 +4,10 @@
node: precise node: precise
jobs: jobs:
- python-jobs - python-jobs
# TODO: standardize these - gate-{name}-pyflakes
#- gate-{name}-pyflakes # TODO: standardize this
#- '{name}-docs #- '{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: - job:
name: zuul-docs name: zuul-docs
@ -59,7 +31,7 @@
- timestamps - timestamps
triggers: triggers:
- zuul_post - zuul-post
logrotate: logrotate:
daysToKeep: 28 daysToKeep: 28
@ -68,7 +40,7 @@
artifactNumToKeep: -1 artifactNumToKeep: -1
builders: builders:
- gerrit_git_prep - gerrit-git-prep
- docs - docs
publishers: publishers: