diff --git a/example/ceilometer.yml b/example/ceilometer.yml index 6a478305d..7eae11fc9 100644 --- a/example/ceilometer.yml +++ b/example/ceilometer.yml @@ -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 diff --git a/example/devstack-gate.yml b/example/devstack-gate.yml index 5f80df29f..dda940c64 100644 --- a/example/devstack-gate.yml +++ b/example/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: diff --git a/example/devstack.yml b/example/devstack.yml index 86ff6434f..13924a351 100644 --- a/example/devstack.yml +++ b/example/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/example/gerrit-verification-status-plugin.yml b/example/gerrit-verification-status-plugin.yml index 9d1f5b826..471e22c8f 100644 --- a/example/gerrit-verification-status-plugin.yml +++ b/example/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/example/gerrit.yml b/example/gerrit.yml index 259f02814..4c8cc8802 100644 --- a/example/gerrit.yml +++ b/example/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: diff --git a/example/gerritbot.yml b/example/gerritbot.yml index 6e2828c20..572a748df 100644 --- a/example/gerritbot.yml +++ b/example/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/example/jenkins-job-builder.yml b/example/jenkins-job-builder.yml index ee2671054..8b0c9b3f7 100644 --- a/example/jenkins-job-builder.yml +++ b/example/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/example/openstack-publish-jobs.yml b/example/openstack-publish-jobs.yml index 51398a7fe..c06fd547d 100644 --- a/example/openstack-publish-jobs.yml +++ b/example/openstack-publish-jobs.yml @@ -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: diff --git a/example/pypi-jobs.yml b/example/pypi-jobs.yml index c9c0d889c..436a95420 100644 --- a/example/pypi-jobs.yml +++ b/example/pypi-jobs.yml @@ -77,6 +77,7 @@ project: '{name}' site: '{tarball-publisher-site}' + - job-group: name: pypi-jobs jobs: diff --git a/example/pypi-mirror.yml b/example/pypi-mirror.yml index fd29d85e6..8bb7cb6a5 100644 --- a/example/pypi-mirror.yml +++ b/example/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/example/python-bitrot-jobs.yml b/example/python-bitrot-jobs.yml index 5b1d6fc22..77e508c96 100644 --- a/example/python-bitrot-jobs.yml +++ b/example/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/example/requirements.yml b/example/requirements.yml index de6734557..f936cf785 100644 --- a/example/requirements.yml +++ b/example/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/example/tempest.yml b/example/tempest.yml index edaf0ebe0..9e32d1c9e 100644 --- a/example/tempest.yml +++ b/example/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/example/zuul.yml b/example/zuul.yml index e5db8f9a1..5ea95b627 100644 --- a/example/zuul.yml +++ b/example/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