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: If27b9edbbea3d0e9c4ee92a915c64b15420f7f49 Reviewed-on: https://review.openstack.org/11160 Approved: James E. Blair <corvus@inaugust.com> Reviewed-by: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
This commit is contained in:
parent
6a5392603e
commit
da4b74b8fa
@ -26,12 +26,11 @@
|
||||
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
|
||||
@ -63,12 +62,11 @@
|
||||
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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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'
|
||||
|
@ -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
|
||||
|
@ -40,6 +40,7 @@
|
||||
remove-prefix: 'doc/build/html'
|
||||
excludes: ''
|
||||
|
||||
|
||||
- job-template:
|
||||
name: '{name}-tarball'
|
||||
project-type: freestyle
|
||||
@ -80,6 +81,7 @@
|
||||
project: '{name}'
|
||||
site: '{tarball-publisher-site}'
|
||||
|
||||
|
||||
- job-group:
|
||||
name: openstack-publish-jobs
|
||||
jobs:
|
||||
|
@ -77,6 +77,7 @@
|
||||
project: '{name}'
|
||||
site: '{tarball-publisher-site}'
|
||||
|
||||
|
||||
- job-group:
|
||||
name: pypi-jobs
|
||||
jobs:
|
||||
|
@ -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
|
||||
|
@ -129,6 +129,7 @@
|
||||
- 'periodic-{name}-python27-{branch-name}'
|
||||
- 'periodic-{name}-docs-{branch-name}'
|
||||
|
||||
|
||||
- job-group:
|
||||
name: python-essex-bitrot-jobs
|
||||
branch: 'stable/essex'
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user