From 1b37d05edbff9293756783f2bc0c11d8d8817384 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 10 Aug 2012 10:02:51 -0700 Subject: [PATCH] Remove example config. Change test.sh to expect a config directory, symlinked to config files outside of this project. Change-Id: I84067b494bd8e9ce28c9e74c3556ec78000d83e8 Reviewed-on: https://review.openstack.org/11161 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .gitignore | 1 + example/ceilometer.yml | 78 ----- example/cinder.yml | 10 - example/devstack-gate.yml | 248 ---------------- example/devstack.yml | 7 - example/gerrit-verification-status-plugin.yml | 7 - example/gerrit.yml | 130 --------- example/gerritbot.yml | 13 - example/gerritlib.yml | 45 --- example/glance.yml | 10 - example/heat.yml | 7 - example/horizon.yml | 43 --- example/jenkins-job-builder.yml | 7 - example/keystone.yml | 10 - example/macros.yml | 115 -------- example/mraas.yml | 82 ------ example/nova.yml | 12 - example/openstack-ci-puppet.yml | 63 ----- example/openstack-common.yml | 10 - example/openstack-publish-jobs.yml | 89 ------ example/pbr.yml | 10 - example/pypi-jobs.yml | 86 ------ example/pypi-mirror.yml | 8 - example/python-bitrot-jobs.yml | 141 --------- example/python-cinderclient.yml | 10 - example/python-glanceclient.yml | 10 - example/python-jobs.yml | 267 ------------------ example/python-keystoneclient.yml | 10 - example/python-novaclient.yml | 10 - example/python-openstackclient.yml | 10 - example/python-quantumclient.yml | 10 - example/python-swiftclient.yml | 10 - example/quantum.yml | 10 - example/reddwarf.yml | 7 - example/requirements.yml | 7 - example/swift.yml | 10 - example/tempest.yml | 8 - example/zuul.yml | 51 ---- test.sh | 8 +- 39 files changed, 7 insertions(+), 1663 deletions(-) delete mode 100644 example/ceilometer.yml delete mode 100644 example/cinder.yml delete mode 100644 example/devstack-gate.yml delete mode 100644 example/devstack.yml delete mode 100644 example/gerrit-verification-status-plugin.yml delete mode 100644 example/gerrit.yml delete mode 100644 example/gerritbot.yml delete mode 100644 example/gerritlib.yml delete mode 100644 example/glance.yml delete mode 100644 example/heat.yml delete mode 100644 example/horizon.yml delete mode 100644 example/jenkins-job-builder.yml delete mode 100644 example/keystone.yml delete mode 100644 example/macros.yml delete mode 100644 example/mraas.yml delete mode 100644 example/nova.yml delete mode 100644 example/openstack-ci-puppet.yml delete mode 100644 example/openstack-common.yml delete mode 100644 example/openstack-publish-jobs.yml delete mode 100644 example/pbr.yml delete mode 100644 example/pypi-jobs.yml delete mode 100644 example/pypi-mirror.yml delete mode 100644 example/python-bitrot-jobs.yml delete mode 100644 example/python-cinderclient.yml delete mode 100644 example/python-glanceclient.yml delete mode 100644 example/python-jobs.yml delete mode 100644 example/python-keystoneclient.yml delete mode 100644 example/python-novaclient.yml delete mode 100644 example/python-openstackclient.yml delete mode 100644 example/python-quantumclient.yml delete mode 100644 example/python-swiftclient.yml delete mode 100644 example/quantum.yml delete mode 100644 example/reddwarf.yml delete mode 100644 example/requirements.yml delete mode 100644 example/swift.yml delete mode 100644 example/tempest.yml delete mode 100644 example/zuul.yml diff --git a/.gitignore b/.gitignore index 7fdea582c..e54e9a92f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc *.egg-info +config diff --git a/example/ceilometer.yml b/example/ceilometer.yml deleted file mode 100644 index 7eae11fc9..000000000 --- a/example/ceilometer.yml +++ /dev/null @@ -1,78 +0,0 @@ -- project: - name: ceilometer - github-org: stackforge - node: oneiric - - jobs: - - python-jobs - - -- job: - name: 'gate-ceilometer-python26-essex' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: https://github.com/stackforge/ceilometer - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - zuul - - builders: - - gerrit-git-prep - - python26-essex - - # >= precise does not have python2.6 - node: oneiric - - -- job: - name: 'gate-ceilometer-python27-essex' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: https://github.com/stackforge/ceilometer - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - zuul - - builders: - - gerrit-git-prep - - python27-essex - - node: oneiric diff --git a/example/cinder.yml b/example/cinder.yml deleted file mode 100644 index 5a0499eed..000000000 --- a/example/cinder.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: cinder - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs diff --git a/example/devstack-gate.yml b/example/devstack-gate.yml deleted file mode 100644 index dda940c64..000000000 --- a/example/devstack-gate.yml +++ /dev/null @@ -1,248 +0,0 @@ -- project: - name: devstack-gate - github-org: openstack-ci - node: precise - - jobs: - - gate-{name}-merge - - -- job: - name: gate-integration-tests-devstack-vm - project-type: freestyle - concurrent: true - node: devstack-precise - - properties: - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - label: - name: NODE_LABEL - description: Label of node to use for this build - default: devstack-precise - - wrappers: - - timeout: - timeout: 40 - fail: true - - timestamps - - triggers: - - zuul - - builders: - - trigger-builds: - - project: devstack-update-inprogress - predefined-parameters: - DEVSTACK_NODE_NAME=${NODE_NAME} - - shell: | - #!/bin/bash -xe - # - # This job also gates devstack-gate, but in case a previous run fails, - # we need to always make sure that we're starting with the latest copy - # from master, before we start applying changes to it. If a previous run - # leaves a bad copy of the gate script, we may get stuck. - # - if [[ ! -e devstack-gate ]]; then - git clone https://review.openstack.org/p/openstack-ci/devstack-gate - else - cd devstack-gate - git remote update - git reset --hard - git clean -x -f - git checkout master - git reset --hard remotes/origin/master - git clean -x -f - cd .. - fi - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - publishers: - - archive: - artifacts: logs/* - - trigger-parameterized-builds: - - project: devstack-update-complete - when: complete - predefined-parameters: - DEVSTACK_NODE_NAME=${NODE_NAME} - - -- job: - name: gate-tempest-devstack-vm - project-type: freestyle - concurrent: true - node: devstack-precise - - properties: - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - label: - name: NODE_LABEL - description: Label of node to use for this build - default: devstack-precise - - wrappers: - - timeout: - timeout: 90 - fail: true - - timestamps - - triggers: - - zuul - - builders: - - trigger-builds: - - project: devstack-update-inprogress - predefined-parameters: - DEVSTACK_NODE_NAME=${NODE_NAME} - - shell: | - #!/bin/bash -xe - # - # This job also gates devstack-gate, but in case a previous run fails, - # we need to always make sure that we're starting with the latest copy - # from master, before we start applying changes to it. If a previous run - # leaves a bad copy of the gate script, we may get stuck. - # - if [[ ! -e devstack-gate ]]; then - git clone https://review.openstack.org/p/openstack-ci/devstack-gate - else - cd devstack-gate - git remote update - git reset --hard - git clean -x -f - git checkout master - git reset --hard remotes/origin/master - git clean -x -f - cd .. - fi - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - publishers: - - archive: - artifacts: logs/* - - trigger-parameterized-builds: - - project: devstack-update-complete - when: complete - predefined-parameters: - DEVSTACK_NODE_NAME=${NODE_NAME} - - -# Called by devstack jobs to alert that they have started so that the -# jenkins slave they are running on can be disabled. -- job: - name: devstack-update-inprogress - project-type: freestyle - concurrent: false - node: master - - properties: - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: 100 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - wrappers: - - timeout: - timeout: 10 - fail: true - - timestamps - - builders: - - shell: | - #!/bin/bash -xe - - if [[ ! -e devstack-gate ]]; then - git clone https://review.openstack.org/p/openstack-ci/devstack-gate - else - cd devstack-gate - git remote update - git pull --ff-only origin - cd .. - fi - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - $WORKSPACE/devstack-gate/devstack-vm-inprogress.py $DEVSTACK_NODE_NAME - - -# Called by devstack jobs to alert that they have completed so that the -# jenkins slave may be deleted. -- job: - name: devstack-update-complete - project-type: freestyle - concurrent: false - node: master - - properties: - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: 100 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - wrappers: - - timeout: - timeout: 10 - fail: true - - timestamps - - builders: - - shell: | - #!/bin/bash -xe - - if [[ ! -e devstack-gate ]]; then - git clone https://review.openstack.org/p/openstack-ci/devstack-gate - else - cd devstack-gate - git remote update - git pull --ff-only origin - cd .. - fi - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - $WORKSPACE/devstack-gate/devstack-vm-delete.py $DEVSTACK_NODE_NAME diff --git a/example/devstack.yml b/example/devstack.yml deleted file mode 100644 index 13924a351..000000000 --- a/example/devstack.yml +++ /dev/null @@ -1,7 +0,0 @@ -- project: - name: devstack - github-org: openstack-dev - node: precise - - jobs: - - gate-{name}-merge diff --git a/example/gerrit-verification-status-plugin.yml b/example/gerrit-verification-status-plugin.yml deleted file mode 100644 index 471e22c8f..000000000 --- a/example/gerrit-verification-status-plugin.yml +++ /dev/null @@ -1,7 +0,0 @@ -- project: - name: gerrit-verification-status-plugin - github-org: openstack-ci - node: precise - - jobs: - - gate-{name}-merge diff --git a/example/gerrit.yml b/example/gerrit.yml deleted file mode 100644 index 4c8cc8802..000000000 --- a/example/gerrit.yml +++ /dev/null @@ -1,130 +0,0 @@ -- project: - name: gerrit - github-org: openstack-ci - node: precise - - jobs: - - gate-{name}-merge - - -- job: - name: check-gerrit-unittests - project-type: maven - concurrent: true - node: precise - - wrappers: - - timeout: - timeout: 40 - fail: true - - properties: - - github: - url: https://github.com/openstack-ci/gerrit - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - triggers: - - zuul - - prebuilders: - - gerrit-git-prep - - gerrit-preclean - - maven: - root-module: - group-id: com.google.gerrit - artifact-id: gerrit-parent - goals: 'clean package -Dgerrit.include-documentation=1 -X' - - postbuilders: - - gerrit-postrun - - publishers: - - war: - site: 'nova.openstack.org' - warfile: 'gerrit-war/target/gerrit*.war' - target: 'tarballs/ci/test/' - - -- job: - name: gate-gerrit-unittests - project-type: maven - concurrent: true - node: precise - - wrappers: - - timeout: - timeout: 40 - fail: true - - properties: - - github: - url: https://github.com/openstack-ci/gerrit - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - triggers: - - zuul - - prebuilders: - - gerrit-git-prep - - gerrit-preclean - - maven: - root-module: - group-id: com.google.gerrit - artifact-id: gerrit-parent - goals: 'clean package -Dgerrit.include-documentation=1 -X' - - postbuilders: - - gerrit-postrun - - -- job: - name: gerrit-package - project-type: maven - concurrent: true - node: precise - - wrappers: - - timeout: - timeout: 40 - fail: true - - properties: - - github: - url: https://github.com/openstack-ci/gerrit - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - triggers: - - zuul-post - - prebuilders: - - gerrit-git-prep - - gerrit-preclean - - maven: - root-module: - group-id: com.google.gerrit - artifact-id: gerrit-parent - goals: 'clean package -Dgerrit.include-documentation=1 -X' - - postbuilders: - - gerrit-postrun - - publishers: - - war: - site: 'nova.openstack.org' - warfile: 'gerrit-war/target/gerrit*.war' - target: 'tarballs/ci/' diff --git a/example/gerritbot.yml b/example/gerritbot.yml deleted file mode 100644 index 572a748df..000000000 --- a/example/gerritbot.yml +++ /dev/null @@ -1,13 +0,0 @@ -- project: - name: gerritbot - github-org: openstack-ci - node: precise - doc-publisher-site: ci.openstack.org - tarball-publisher-site: ci.openstack.org - - jobs: - - gate-{name}-merge - - gate-{name}-pep8 - - gate-{name}-pyflakes - - '{name}-sdist-tarball' - - '{name}-pypi' diff --git a/example/gerritlib.yml b/example/gerritlib.yml deleted file mode 100644 index 416d77269..000000000 --- a/example/gerritlib.yml +++ /dev/null @@ -1,45 +0,0 @@ -- project: - name: gerritlib - github-org: openstack-ci - node: precise - doc-publisher-site: ci.openstack.org - tarball-publisher-site: ci.openstack.org - - jobs: - - gate-{name}-merge - - gate-{name}-pep8 - - gate-{name}-pyflakes - # TODO: standardize - #- '{name}-pypi' - -- job: - name: 'gerritlib-pypi' - concurrent: true - node: pypi - - properties: - - github: - url: 'https://github.com/openstack-ci/gerritlib' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul-post - - builders: - - gerrit-git-prep - - shell: tox -v -evenv python setup.py sdist upload - - publishers: - - tarball: - project: 'ci' - site: 'nova.openstack.org' diff --git a/example/glance.yml b/example/glance.yml deleted file mode 100644 index 7806057eb..000000000 --- a/example/glance.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: glance - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs diff --git a/example/heat.yml b/example/heat.yml deleted file mode 100644 index 85ba5c00d..000000000 --- a/example/heat.yml +++ /dev/null @@ -1,7 +0,0 @@ -- project: - name: heat - github-org: heat-api - node: oneiric - - jobs: - - python-jobs diff --git a/example/horizon.yml b/example/horizon.yml deleted file mode 100644 index 6e73ecb2e..000000000 --- a/example/horizon.yml +++ /dev/null @@ -1,43 +0,0 @@ -- project: - name: horizon - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs - -- job: - name: gate-horizon-selenium - concurrent: true - node: precise - - properties: - - github: - url: https://github.com/openstack/horizon - - 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 - - selenium diff --git a/example/jenkins-job-builder.yml b/example/jenkins-job-builder.yml deleted file mode 100644 index 8b0c9b3f7..000000000 --- a/example/jenkins-job-builder.yml +++ /dev/null @@ -1,7 +0,0 @@ -- project: - name: jenkins-job-builder - github-org: openstack-ci - node: precise - - jobs: - - gate-{name}-merge diff --git a/example/keystone.yml b/example/keystone.yml deleted file mode 100644 index a1a0d9865..000000000 --- a/example/keystone.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: keystone - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs diff --git a/example/macros.yml b/example/macros.yml deleted file mode 100644 index 9e628ffd9..000000000 --- a/example/macros.yml +++ /dev/null @@ -1,115 +0,0 @@ -- builder: - name: gerrit-git-prep - builders: - - shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh review.openstack.org" - -- builder: - name: coverage - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-cover.sh" - -- builder: - name: docs - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh" - -- builder: - name: maven-test - builders: - - shell: "mvn test" - -- builder: - name: maven-package - builders: - - shell: "mvn package" - -- builder: - name: gerrit-package - builders: - - shell: "/usr/local/jenkins/slave_scripts/package-gerrit.sh" - -- builder: - 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 - builders: - - shell: "./tools/version.sh --reset" - -- builder: - name: pep8 - builders: - - shell: "set -o pipefail ; tox -v -epep8 | tee pep8.txt ; set +o pipefail" - -- builder: - name: pyflakes - builders: - - shell: "tox -v -epyflakes" - -- builder: - name: puppet-syntax - builders: - # TODO: remove blank line - - shell: | - - find . -iname *.pp | xargs puppet parser validate --modulepath=`pwd`/modules - for f in `find . -iname *.erb` ; do - erb -x -T '-' $f | ruby -c - done - -- builder: - name: selenium - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-selenium.sh" - -- builder: - name: python26 - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26" - - something: - arg: value - -- builder: - name: python27 - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27" - -- builder: - name: python26-essex - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-essex" - -- builder: - name: python27-essex - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-essex" - -- builder: - name: tarball - builders: - - shell: "/usr/local/jenkins/slave_scripts/create-tarball.sh {project}" - -# ====================================================================== - -- publisher: - name: tarball - publishers: - - archive: - artifacts: 'dist/*.tar.gz' - - scp: - site: '{site}' - source: 'dist/*.tar.gz' - target: 'tarballs/{project}/' - -- publisher: - name: war - publishers: - - archive: - artifacts: '{warfile}' - - scp: - site: '{site}' - source: '{warfile}' - target: '{target}' diff --git a/example/mraas.yml b/example/mraas.yml deleted file mode 100644 index 78f8b87ad..000000000 --- a/example/mraas.yml +++ /dev/null @@ -1,82 +0,0 @@ -- project: - name: MRaaS - github-org: stackforge - node: precise - -- job: - name: gate-MRaaS-merge - concurrent: false - node: oneiric - - properties: - - github: - url: https://github.com/stackforge/MRaaS - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - gerrit: - triggerOnPatchsetUploadedEvent: 'false' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'true' - triggerOnRefUpdatedEvent: 'false' - triggerApprovalCategory: 'APRV' - triggerApprovalValue: 1 - failureMessage: 'This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.' - projects: - - projectCompareType: 'PLAIN' - projectPattern: 'stackforge/MRaaS' - branchCompareType: 'ANT' - branchPattern: '**' - - builders: - - gerrit-git-prep - - -- job: - name: check-MRaaS-merge - concurrent: false - node: oneiric - - properties: - - github: - url: https://github.com/stackforge/MRaaS - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - gerrit: - triggerOnPatchsetUploadedEvent: 'true' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'false' - triggerOnRefUpdatedEvent: 'false' - overrideVotes: 'true' - gerritBuildSuccessfulVerifiedValue: 1 - gerritBuildFailedVerifiedValue: -1 - failureMessage: 'This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.' - projects: - - projectCompareType: 'PLAIN' - projectPattern: 'stackforge/MRaaS' - branchCompareType: 'ANT' - branchPattern: '**' - - builders: - - gerrit-git-prep diff --git a/example/nova.yml b/example/nova.yml deleted file mode 100644 index 0dfd2a8eb..000000000 --- a/example/nova.yml +++ /dev/null @@ -1,12 +0,0 @@ -- project: - name: nova - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - python-diablo-bitrot-jobs - - python-essex-bitrot-jobs - - openstack-publish-jobs diff --git a/example/openstack-ci-puppet.yml b/example/openstack-ci-puppet.yml deleted file mode 100644 index b2046e9a4..000000000 --- a/example/openstack-ci-puppet.yml +++ /dev/null @@ -1,63 +0,0 @@ -- project: - name: ci-puppet - github-org: openstack - node: precise - - # TODO: standardize - #jobs: - # - gate-{name}-merge - -- job: - name: gate-ci-puppet-merge - concurrent: true - node: precise - - properties: - - github: - url: https://github.com/openstack/openstack-ci-puppet - - 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-ci-puppet-syntax - concurrent: true - node: precise - - properties: - - github: - url: https://github.com/openstack/openstack-ci-puppet - - 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 - - puppet-syntax - - pyflakes diff --git a/example/openstack-common.yml b/example/openstack-common.yml deleted file mode 100644 index 16b5005b9..000000000 --- a/example/openstack-common.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: openstack-common - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs diff --git a/example/openstack-publish-jobs.yml b/example/openstack-publish-jobs.yml deleted file mode 100644 index c06fd547d..000000000 --- a/example/openstack-publish-jobs.yml +++ /dev/null @@ -1,89 +0,0 @@ -- job-template: - name: '{name}-docs' - project-type: freestyle - concurrent: true - node: precise - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul-post - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - builders: - - gerrit-git-prep - - docs - - publishers: - - ftp: - site: '{doc-publisher-site}' - source: 'doc/build/html/**' - target: 'developer/{name}' - remove-prefix: 'doc/build/html' - excludes: '' - - -- job-template: - name: '{name}-tarball' - project-type: freestyle - concurrent: true - node: precise - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul-post - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - builders: - - gerrit-git-prep - - tarball: - project: '{name}' - - publishers: - - tarball: - project: '{name}' - site: '{tarball-publisher-site}' - - -- job-group: - name: openstack-publish-jobs - jobs: - - '{name}-docs' - - '{name}-tarball' diff --git a/example/pbr.yml b/example/pbr.yml deleted file mode 100644 index 6025e33eb..000000000 --- a/example/pbr.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: pbr - github-org: openstack-dev - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - pypi-jobs diff --git a/example/pypi-jobs.yml b/example/pypi-jobs.yml deleted file mode 100644 index 436a95420..000000000 --- a/example/pypi-jobs.yml +++ /dev/null @@ -1,86 +0,0 @@ -- job-template: - name: '{name}-sdist-tarball' - project-type: freestyle - concurrent: true - node: precise - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - 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/{name}-$BRANCH_PATH.tar.gz - - publishers: - - tarball: - project: '{name}' - site: '{tarball-publisher-site}' - - -- job-template: - name: '{name}-pypi' - project-type: freestyle - concurrent: true - node: pypi - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - triggers: - - zuul-post - - builders: - - gerrit-git-prep - - shell: tox -v -evenv python setup.py sdist upload - - publishers: - - tarball: - project: '{name}' - site: '{tarball-publisher-site}' - - -- job-group: - name: pypi-jobs - jobs: - - '{name}-docs' - - '{name}-sdist-tarball' - - '{name}-pypi' diff --git a/example/pypi-mirror.yml b/example/pypi-mirror.yml deleted file mode 100644 index 8bb7cb6a5..000000000 --- a/example/pypi-mirror.yml +++ /dev/null @@ -1,8 +0,0 @@ -- project: - name: pypi-mirror - github-org: openstack-ci - node: precise - - jobs: - - gate-{name}-merge - - gate-{name}-pyflakes diff --git a/example/python-bitrot-jobs.yml b/example/python-bitrot-jobs.yml deleted file mode 100644 index 77e508c96..000000000 --- a/example/python-bitrot-jobs.yml +++ /dev/null @@ -1,141 +0,0 @@ -- job-template: - name: 'periodic-{name}-python26-{branch-name}' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - timed: '@daily' - - builders: - - python26 - - scm: - - git: - url: 'git://github.com/{github-org}/{name}.git' - branches: - - 'origin/{branch}' - - # >= precise does not have python2.6 - node: oneiric - - -- job-template: - name: 'periodic-{name}-python27-{branch-name}' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - timed: '@daily' - - builders: - - python27 - - scm: - - git: - url: 'git://github.com/{github-org}/{name}.git' - branches: - - 'origin/{branch}' - - node: '{node}' - - -- job-template: - name: 'periodic-{name}-docs-{branch-name}' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - timed: '@daily' - - builders: - - docs - - scm: - - git: - url: 'git://github.com/{github-org}/{name}.git' - branches: - - 'origin/{branch}' - - node: '{node}' - - -- job-group: - name: python-diablo-bitrot-jobs - branch: 'stable/diablo' - branch-name: 'stable-diablo' - node: oneiric - jobs: - - 'periodic-{name}-python26-{branch-name}' - - 'periodic-{name}-python27-{branch-name}' - - 'periodic-{name}-docs-{branch-name}' - - -- job-group: - name: python-essex-bitrot-jobs - branch: 'stable/essex' - branch-name: 'stable-essex' - node: precise - jobs: - - 'periodic-{name}-python26-{branch-name}' - - 'periodic-{name}-python27-{branch-name}' - - 'periodic-{name}-docs-{branch-name}' diff --git a/example/python-cinderclient.yml b/example/python-cinderclient.yml deleted file mode 100644 index d05a16f76..000000000 --- a/example/python-cinderclient.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: python-cinderclient - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - pypi-jobs diff --git a/example/python-glanceclient.yml b/example/python-glanceclient.yml deleted file mode 100644 index 691737e26..000000000 --- a/example/python-glanceclient.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: python-glanceclient - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - pypi-jobs diff --git a/example/python-jobs.yml b/example/python-jobs.yml deleted file mode 100644 index 55c245899..000000000 --- a/example/python-jobs.yml +++ /dev/null @@ -1,267 +0,0 @@ -- job-template: - name: '{name}-coverage' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - zuul-post - - builders: - - gerrit-git-prep - - coverage - - publishers: - - coverage - - node: '{node}' - - -- job-template: - name: 'gate-{name}-pep8' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - zuul - - builders: - - gerrit-git-prep - - pep8 - - publishers: - - pep8 - - node: '{node}' - - -- job-template: - name: 'gate-{name}-python26' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - zuul - - builders: - - gerrit-git-prep - - python26 - - # >= precise does not have python2.6 - node: oneiric - - -- job-template: - name: 'gate-{name}-python27' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - label: - name: NODE_LABEL - description: Label of node to use for this build - default: '{node}' - - triggers: - - zuul - - builders: - - gerrit-git-prep - - python27 - - node: '{node}' - - -- job-template: - name: 'gate-{name}-merge' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - zuul - - builders: - - gerrit-git-prep - - node: '{node}' - - -- job-template: - name: 'gate-{name}-docs' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - throttle: - max-per-node: 0 - max-total: 0 - option: project - enabled: false - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - triggers: - - zuul - - builders: - - gerrit-git-prep - - docs - - node: '{node}' - - -- job-template: - name: 'gate-{name}-pyflakes' - project-type: freestyle - concurrent: true - node: precise - - properties: - - github: - url: 'https://github.com/{github-org}/{name}' - - 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 - - pyflakes - - -- job-group: - name: python-jobs - jobs: - - '{name}-coverage' - - 'gate-{name}-merge' - - 'gate-{name}-pep8' - - 'gate-{name}-python26' - - 'gate-{name}-python27' - - 'gate-{name}-docs' - # pyflakes isn't standard diff --git a/example/python-keystoneclient.yml b/example/python-keystoneclient.yml deleted file mode 100644 index 6d4f94d1c..000000000 --- a/example/python-keystoneclient.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: python-keystoneclient - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - pypi-jobs diff --git a/example/python-novaclient.yml b/example/python-novaclient.yml deleted file mode 100644 index 08ac2a3ab..000000000 --- a/example/python-novaclient.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: python-novaclient - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - pypi-jobs diff --git a/example/python-openstackclient.yml b/example/python-openstackclient.yml deleted file mode 100644 index caac05c5a..000000000 --- a/example/python-openstackclient.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: python-openstackclient - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - pypi-jobs diff --git a/example/python-quantumclient.yml b/example/python-quantumclient.yml deleted file mode 100644 index 64c5c3f8d..000000000 --- a/example/python-quantumclient.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: python-quantumclient - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - pypi-jobs diff --git a/example/python-swiftclient.yml b/example/python-swiftclient.yml deleted file mode 100644 index ab0e47b66..000000000 --- a/example/python-swiftclient.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: python-swiftclient - github-org: openstack - node: precise - tarball-publisher-site: swift.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - pypi-jobs diff --git a/example/quantum.yml b/example/quantum.yml deleted file mode 100644 index 3bae88f7e..000000000 --- a/example/quantum.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: quantum - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs diff --git a/example/reddwarf.yml b/example/reddwarf.yml deleted file mode 100644 index 7786f8e6e..000000000 --- a/example/reddwarf.yml +++ /dev/null @@ -1,7 +0,0 @@ -- project: - name: reddwarf - github-org: stackforge - node: oneiric - - jobs: - - python-jobs diff --git a/example/requirements.yml b/example/requirements.yml deleted file mode 100644 index f936cf785..000000000 --- a/example/requirements.yml +++ /dev/null @@ -1,7 +0,0 @@ -- project: - name: requirements - github-org: openstack - node: precise - - jobs: - - gate-{name}-merge diff --git a/example/swift.yml b/example/swift.yml deleted file mode 100644 index 6faa2c651..000000000 --- a/example/swift.yml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - name: swift - github-org: openstack - node: precise - tarball-publisher-site: nova.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs diff --git a/example/tempest.yml b/example/tempest.yml deleted file mode 100644 index 9e32d1c9e..000000000 --- a/example/tempest.yml +++ /dev/null @@ -1,8 +0,0 @@ -- project: - name: tempest - github-org: openstack-ci - node: precise - - jobs: - - gate-{name}-merge - - gate-{name}-pep8 diff --git a/example/zuul.yml b/example/zuul.yml deleted file mode 100644 index 5ea95b627..000000000 --- a/example/zuul.yml +++ /dev/null @@ -1,51 +0,0 @@ -- project: - name: zuul - github-org: openstack-ci - node: precise - jobs: - - python-jobs - - gate-{name}-pyflakes - # TODO: standardize this - #- '{name}-docs - - -- job: - name: zuul-docs - 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-post - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - builders: - - gerrit-git-prep - - docs - - publishers: - - scp: - site: '173.203.107.207' - source: 'doc/build/html/**/*' - target: 'ci/zuul' - keep-hierarchy: true diff --git a/test.sh b/test.sh index b5bec2a67..ddb6bc827 100755 --- a/test.sh +++ b/test.sh @@ -1,6 +1,10 @@ #!/bin/bash # A simple script to verify that the XML output is unaltered after a change. + +# First, symlink "config" to the directory containing your config files +# (eg openstack-ci-puppet/modules/openstack_project/files/jenkins_job_builder/config) + # Before you start work, run "./test.sh save". # As you test your change, run "./test.sh" to see differences in XML output. @@ -10,10 +14,10 @@ mkdir -p /tmp/jenkins_jobs_test/test if [ "$1" == "save" ] then rm -f /tmp/jenkins_jobs_test/saved/* - jenkins-jobs test -o /tmp/jenkins_jobs_test/saved/ example + jenkins-jobs test -o /tmp/jenkins_jobs_test/saved/ config else rm -f /tmp/jenkins_jobs_test/test/* - jenkins-jobs test -o /tmp/jenkins_jobs_test/test/ example + jenkins-jobs test -o /tmp/jenkins_jobs_test/test/ config for x in `(cd /tmp/jenkins_jobs_test/saved && find -type f)` do if ! diff -u /tmp/jenkins_jobs_test/saved/$x /tmp/jenkins_jobs_test/test/$x >/dev/null 2>&1