From 32eb3deba0cd311b6d7d2e7c7ac9fecfa77e0b7c Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 4 Jun 2012 12:12:19 -0700 Subject: [PATCH] Switch all jobs to Zuul. Change-Id: I8b15bec5e3e936e4a698737cf86354dd91a7850c --- manifests/site.pp | 2 + .../projects/openstack/devstack-gate.yml | 44 +++ .../files/projects/openstack/devstack.yml | 44 +++ .../files/templates/python_jobs.yml | 235 +++++++--------- .../files/zuul/layout.yaml | 260 ++++++++++++++++++ .../stackforge-config/files/zuul/layout.yaml | 37 +++ 6 files changed, 484 insertions(+), 138 deletions(-) create mode 100644 modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml create mode 100644 modules/jenkins_jobs/files/projects/openstack/devstack.yml diff --git a/manifests/site.pp b/manifests/site.pp index 6d0657d367..0297d72817 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -234,6 +234,8 @@ node "jenkins.openstack.org" { site => "openstack", projects => [ 'cinder', + 'devstack', + 'devstack-gate', 'gerrit', 'glance', 'horizon', diff --git a/modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml b/modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml new file mode 100644 index 0000000000..558c998e0a --- /dev/null +++ b/modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml @@ -0,0 +1,44 @@ +--- +# merge-gate +modules: + - properties + - scm + - assignednode + - builders + - publisher_none + +main: + name: 'gate-devstack-gate-merge' + review_site: 'review.openstack.org' + github_org: 'openstack-ci' + project: 'devstack-gate' + disabled: 'false' + concurrent: 'true' + +parameters: + - name: UUID + type: string + description: Zuul provided key to link builds with Gerrit events + - name: GERRIT_PROJECT + type: string + description: Zuul provided project name + - name: GERRIT_BRANCH + type: string + description: Zuul provided branch name + - name: GERRIT_CHANGES + type: string + description: Zuul provided list of dependent changes to merge + +notification_endpoints: + - protocol: HTTP + URL: http://127.0.0.1:8001/jenkins_endpoint + +builders: + - gerrit_git_prep + +scm: + scm: 'false' + +assignednode: + node: 'oneiric' + diff --git a/modules/jenkins_jobs/files/projects/openstack/devstack.yml b/modules/jenkins_jobs/files/projects/openstack/devstack.yml new file mode 100644 index 0000000000..dd5298b317 --- /dev/null +++ b/modules/jenkins_jobs/files/projects/openstack/devstack.yml @@ -0,0 +1,44 @@ +--- +# merge-gate +modules: + - properties + - scm + - assignednode + - builders + - publisher_none + +main: + name: 'gate-devstack-merge' + review_site: 'review.openstack.org' + github_org: 'openstack-dev' + project: 'devstack' + disabled: 'false' + concurrent: 'true' + +parameters: + - name: UUID + type: string + description: Zuul provided key to link builds with Gerrit events + - name: GERRIT_PROJECT + type: string + description: Zuul provided project name + - name: GERRIT_BRANCH + type: string + description: Zuul provided branch name + - name: GERRIT_CHANGES + type: string + description: Zuul provided list of dependent changes to merge + +notification_endpoints: + - protocol: HTTP + URL: http://127.0.0.1:8001/jenkins_endpoint + +builders: + - gerrit_git_prep + +scm: + scm: 'false' + +assignednode: + node: 'oneiric' + diff --git a/modules/jenkins_jobs/files/templates/python_jobs.yml b/modules/jenkins_jobs/files/templates/python_jobs.yml index 8364e7f630..2ba1f40b0d 100644 --- a/modules/jenkins_jobs/files/templates/python_jobs.yml +++ b/modules/jenkins_jobs/files/templates/python_jobs.yml @@ -41,7 +41,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_pep8 @@ -52,20 +51,25 @@ main: project: '@NAME@' authenticatedBuild: 'true' disabled: '@DISABLED@' + concurrent: 'true' -trigger: - triggerOnPatchsetUploadedEvent: 'false' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'true' - triggerOnRefUpdatedEvent: 'false' - triggerApprovalCategory: 'APRV' - triggerApprovalValue: 1 - failureMessage: '' - projects: - - projectCompareType: 'PLAIN' - projectPattern: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'ANT' - branchPattern: '**' +parameters: + - name: UUID + type: string + description: Zuul provided key to link builds with Gerrit events + - name: GERRIT_PROJECT + type: string + description: Zuul provided project name + - name: GERRIT_BRANCH + type: string + description: Zuul provided branch name + - name: GERRIT_CHANGES + type: string + description: Zuul provided list of dependent changes to merge + +notification_endpoints: + - protocol: HTTP + URL: http://127.0.0.1:8001/jenkins_endpoint builders: - gerrit_git_prep @@ -83,7 +87,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_none @@ -94,20 +97,25 @@ main: project: '@NAME@' authenticatedBuild: 'true' disabled: '@DISABLED@' + concurrent: 'true' -trigger: - triggerOnPatchsetUploadedEvent: 'false' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'true' - triggerOnRefUpdatedEvent: 'false' - triggerApprovalCategory: 'APRV' - triggerApprovalValue: 1 - failureMessage: '' - projects: - - projectCompareType: 'PLAIN' - projectPattern: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'ANT' - branchPattern: '**' +parameters: + - name: UUID + type: string + description: Zuul provided key to link builds with Gerrit events + - name: GERRIT_PROJECT + type: string + description: Zuul provided project name + - name: GERRIT_BRANCH + type: string + description: Zuul provided branch name + - name: GERRIT_CHANGES + type: string + description: Zuul provided list of dependent changes to merge + +notification_endpoints: + - protocol: HTTP + URL: http://127.0.0.1:8001/jenkins_endpoint builders: - gerrit_git_prep @@ -125,7 +133,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_none @@ -136,20 +143,25 @@ main: project: '@NAME@' authenticatedBuild: 'true' disabled: '@DISABLED@' + concurrent: 'true' -trigger: - triggerOnPatchsetUploadedEvent: 'false' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'true' - triggerOnRefUpdatedEvent: 'false' - triggerApprovalCategory: 'APRV' - triggerApprovalValue: 1 - failureMessage: '' - projects: - - projectCompareType: 'PLAIN' - projectPattern: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'ANT' - branchPattern: '**' +parameters: + - name: UUID + type: string + description: Zuul provided key to link builds with Gerrit events + - name: GERRIT_PROJECT + type: string + description: Zuul provided project name + - name: GERRIT_BRANCH + type: string + description: Zuul provided branch name + - name: GERRIT_CHANGES + type: string + description: Zuul provided list of dependent changes to merge + +notification_endpoints: + - protocol: HTTP + URL: http://127.0.0.1:8001/jenkins_endpoint builders: - gerrit_git_prep @@ -200,7 +212,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_none @@ -211,20 +222,25 @@ main: project: '@NAME@' authenticatedBuild: 'true' disabled: '@DISABLED@' + concurrent: 'true' -trigger: - 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: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'ANT' - branchPattern: '**' +parameters: + - name: UUID + type: string + description: Zuul provided key to link builds with Gerrit events + - name: GERRIT_PROJECT + type: string + description: Zuul provided project name + - name: GERRIT_BRANCH + type: string + description: Zuul provided branch name + - name: GERRIT_CHANGES + type: string + description: Zuul provided list of dependent changes to merge + +notification_endpoints: + - protocol: HTTP + URL: http://127.0.0.1:8001/jenkins_endpoint builders: - gerrit_git_prep @@ -268,7 +284,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_tarball @@ -279,20 +294,28 @@ main: project: '@NAME@' authenticatedBulid: 'false' disabled: '@DISABLED@' + concurrent: 'true' -trigger: - triggerOnPatchsetUploadedEvent: 'false' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'false' - triggerOnRefUpdatedEvent: 'true' - triggerApprovalCategory: '' - triggerApprovalValue: '' - failureMessage: '' - projects: - - projectCompareType: 'PLAIN' - projectPattern: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'REG_EXP' - branchPattern: '^(?!refs/).*$' +parameters: + - name: UUID + type: string + description: Zuul provided key to link builds with Gerrit events + - name: GERRIT_PROJECT + type: string + description: Zuul provided project name + - name: GERRIT_REFNAME + type: string + description: Zuul provided ref name + - name: GERRIT_OLDREV + type: string + description: Zuul provided old reference for ref-updated + - name: GERRIT_NEWREV + type: string + description: Zuul provided new reference for ref-updated + +notification_endpoints: + - protocol: HTTP + URL: http://127.0.0.1:8001/jenkins_endpoint builders: - gerrit_git_prep @@ -314,7 +337,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_pep8 @@ -324,24 +346,9 @@ main: github_org: '@GITHUB_ORG@' project: '@NAME@' authenticatedBuild: 'true' - disabled: '@DISABLED@' + disabled: 'true' concurrent: 'true' -trigger: - triggerOnPatchsetUploadedEvent: 'true' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'false' - triggerOnRefUpdatedEvent: 'false' - overrideVotes: 'true' - gerritBuildSuccessfulVerifiedValue: 1 - gerritBuildFailedVerifiedValue: -1 - failureMessage: '' - projects: - - projectCompareType: 'PLAIN' - projectPattern: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'ANT' - branchPattern: '**' - builders: - gerrit_git_prep - pep8 @@ -358,7 +365,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_none @@ -368,24 +374,9 @@ main: github_org: '@GITHUB_ORG@' project: '@NAME@' authenticatedBuild: 'true' - disabled: '@DISABLED@' + disabled: 'true' concurrent: 'true' -trigger: - triggerOnPatchsetUploadedEvent: 'true' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'false' - triggerOnRefUpdatedEvent: 'false' - overrideVotes: 'true' - gerritBuildSuccessfulVerifiedValue: 1 - gerritBuildFailedVerifiedValue: -1 - failureMessage: '' - projects: - - projectCompareType: 'PLAIN' - projectPattern: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'ANT' - branchPattern: '**' - builders: - gerrit_git_prep - python26 @@ -402,7 +393,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_none @@ -412,24 +402,9 @@ main: github_org: '@GITHUB_ORG@' project: '@NAME@' authenticatedBuild: 'true' - disabled: '@DISABLED@' + disabled: 'true' concurrent: 'true' -trigger: - triggerOnPatchsetUploadedEvent: 'true' - triggerOnChangeMergedEvent: 'false' - triggerOnCommentAddedEvent: 'false' - triggerOnRefUpdatedEvent: 'false' - overrideVotes: 'true' - gerritBuildSuccessfulVerifiedValue: 1 - gerritBuildFailedVerifiedValue: -1 - failureMessage: '' - projects: - - projectCompareType: 'PLAIN' - projectPattern: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'ANT' - branchPattern: '**' - builders: - gerrit_git_prep - python27 @@ -446,7 +421,6 @@ modules: - properties - scm - assignednode - - trigger_gerrit - builders - publisher_none @@ -456,24 +430,9 @@ main: github_org: '@GITHUB_ORG@' project: '@NAME@' authenticatedBuild: 'true' - disabled: '@DISABLED@' + disabled: 'true' concurrent: 'true' -trigger: - 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: '@GITHUB_ORG@/@NAME@' - branchCompareType: 'ANT' - branchPattern: '**' - builders: - gerrit_git_prep diff --git a/modules/openstack-ci-config/files/zuul/layout.yaml b/modules/openstack-ci-config/files/zuul/layout.yaml index 4caab9e303..a07eb1fc19 100644 --- a/modules/openstack-ci-config/files/zuul/layout.yaml +++ b/modules/openstack-ci-config/files/zuul/layout.yaml @@ -7,6 +7,7 @@ queues: verified: 1 failure: verified: -1 + - name: gate manager: DependentQueueManager trigger: @@ -18,16 +19,24 @@ queues: submit: true failure: verified: -2 + - name: post manager: IndependentQueueManager trigger: - event: ref-updated ref: ^(?!refs/).*$ + - name: silent + manager: IndependentQueueManager + trigger: + - event: patchset-created + + jobs: - name: ^.*-merge$ failure-message: 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: - name: openstack-ci/zuul check: @@ -38,6 +47,7 @@ projects: - gate-zuul-merge: - gate-zuul-pep8 - gate-zuul-pyflakes + - name: openstack-ci/pypi-mirror check: - gate-pypi-mirror-merge: @@ -45,6 +55,7 @@ projects: gate: - gate-pypi-mirror-merge: - gate-pypi-mirror-pyflakes + - name: openstack-ci/gerrit check: - gate-gerrit-merge: @@ -54,6 +65,7 @@ projects: - gate-gerrit-unittests post: - gerrit-package + - name: openstack/openstack-ci-puppet check: - gate-ci-puppet-merge: @@ -61,3 +73,251 @@ projects: gate: - gate-ci-puppet-merge: - gate-ci-puppet-syntax + + - name: openstack/cinder + check: + - gate-cinder-merge: + - gate-cinder-pep8 + - gate-cinder-python26 + - gate-cinder-python27 + gate: + - gate-cinder-merge: + - gate-cinder-pep8 + - gate-cinder-python26 + - gate-cinder-python27 + + - name: openstack/glance + check: + - gate-glance-merge: + - gate-glance-pep8 + - gate-glance-python26 + - gate-glance-python27 + - gate-integration-tests-devstack-vm + gate: + - gate-glance-merge: + - gate-glance-pep8 + - gate-glance-python26 + - gate-glance-python27 + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack/horizon + check: + - gate-horizon-merge: + - gate-horizon-pep8 + - gate-horizon-python26 + - gate-horizon-python27 + - gate-integration-tests-devstack-vm + gate: + - gate-horizon-merge: + - gate-horizon-pep8 + - gate-horizon-python26 + - gate-horizon-python27 + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack/keystone + check: + - gate-keystone-merge: + - gate-keystone-pep8 + - gate-keystone-python26 + - gate-keystone-python27 + - gate-integration-tests-devstack-vm + gate: + - gate-keystone-merge: + - gate-keystone-pep8 + - gate-keystone-python26 + - gate-keystone-python27 + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack/melange + check: + - gate-melange-merge: + - gate-melange-pep8 + - gate-melange-python26 + - gate-melange-python27 + gate: + - gate-melange-merge: + - gate-melange-pep8 + - gate-melange-python26 + - gate-melange-python27 + silent: + - gate-tempest-devstack-vm + + - name: openstack/nova + check: + - gate-nova-merge: + - gate-nova-pep8 + - gate-nova-python26 + - gate-nova-python27 + - gate-integration-tests-devstack-vm + gate: + - gate-nova-merge: + - gate-nova-pep8 + - gate-nova-python26 + - gate-nova-python27 + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack/quantum + check: + - gate-quantum-merge: + - gate-quantum-pep8 + - gate-quantum-python26 + - gate-quantum-python27 + gate: + - gate-quantum-merge: + - gate-quantum-pep8 + - gate-quantum-python26 + - gate-quantum-python27 + + - name: openstack/swift + check: + - gate-swift-merge: + - gate-swift-pep8 + - gate-swift-python26 + - gate-swift-python27 + gate: + - gate-swift-merge: + - gate-swift-pep8 + - gate-swift-python26 + - gate-swift-python27 + + - name: openstack/python-cinderclient + check: + - gate-python-cinderclient-merge: + - gate-python-cinderclient-pep8 + - gate-python-cinderclient-python26 + - gate-python-cinderclient-python27 + gate: + - gate-python-cinderclient-merge: + - gate-python-cinderclient-pep8 + - gate-python-cinderclient-python26 + - gate-python-cinderclient-python27 + silent: + - gate-tempest-devstack-vm + + - name: openstack/python-glanceclient + check: + - gate-python-glanceclient-merge: + - gate-python-glanceclient-pep8 + - gate-python-glanceclient-python26 + - gate-python-glanceclient-python27 + - gate-integration-tests-devstack-vm + gate: + - gate-python-glanceclient-merge: + - gate-python-glanceclient-pep8 + - gate-python-glanceclient-python26 + - gate-python-glanceclient-python27 + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack/python-keystoneclient + check: + - gate-python-keystoneclient-merge: + - gate-python-keystoneclient-pep8 + - gate-python-keystoneclient-python26 + - gate-python-keystoneclient-python27 + - gate-integration-tests-devstack-vm + gate: + - gate-python-keystoneclient-merge: + - gate-python-keystoneclient-pep8 + - gate-python-keystoneclient-python26 + - gate-python-keystoneclient-python27 + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack/python-melangeclient + check: + - gate-python-melangeclient-merge: + - gate-python-melangeclient-pep8 + - gate-python-melangeclient-python26 + - gate-python-melangeclient-python27 + gate: + - gate-python-melangeclient-merge: + - gate-python-melangeclient-pep8 + - gate-python-melangeclient-python26 + - gate-python-melangeclient-python27 + + - name: openstack/python-novaclient + check: + - gate-python-novaclient-merge: + - gate-python-novaclient-pep8 + - gate-python-novaclient-python26 + - gate-python-novaclient-python27 + - gate-integration-tests-devstack-vm + gate: + - gate-python-novaclient-merge: + - gate-python-novaclient-pep8 + - gate-python-novaclient-python26 + - gate-python-novaclient-python27 + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack/python-openstackclient + check: + - gate-python-openstackclient-merge: + - gate-python-openstackclient-pep8 + - gate-python-openstackclient-python26 + - gate-python-openstackclient-python27 + gate: + - gate-python-openstackclient-merge: + - gate-python-openstackclient-pep8 + - gate-python-openstackclient-python26 + - gate-python-openstackclient-python27 + + - name: openstack/python-quantumclient + check: + - gate-python-quantumclient-merge: + - gate-python-quantumclient-pep8 + - gate-python-quantumclient-python26 + - gate-python-quantumclient-python27 + - gate-integration-tests-devstack-vm + gate: + - gate-python-quantumclient-merge: + - gate-python-quantumclient-pep8 + - gate-python-quantumclient-python26 + - gate-python-quantumclient-python27 + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack/python-swiftclient + check: + - gate-python-swiftclient-merge: + - gate-python-swiftclient-pep8 + - gate-python-swiftclient-python26 + - gate-python-swiftclient-python27 + gate: + - gate-python-swiftclient-merge: + - gate-python-swiftclient-pep8 + - gate-python-swiftclient-python26 + - gate-python-swiftclient-python27 + + - name: openstack-dev/devstack: + check: + - gate-devstack-merge: + - gate-integration-tests-devstack-vm + gate: + - gate-devstack-merge: + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm + + - name: openstack-ci/devstack-gate: + check: + - gate-devstack-gate-merge: + - gate-integration-tests-devstack-vm + gate: + - gate-devstack-gate-merge: + - gate-integration-tests-devstack-vm + silent: + - gate-tempest-devstack-vm diff --git a/modules/stackforge-config/files/zuul/layout.yaml b/modules/stackforge-config/files/zuul/layout.yaml index 5e1722d524..724adbdb18 100644 --- a/modules/stackforge-config/files/zuul/layout.yaml +++ b/modules/stackforge-config/files/zuul/layout.yaml @@ -7,6 +7,7 @@ queues: verified: 1 failure: verified: -1 + - name: gate manager: DependentQueueManager trigger: @@ -18,6 +19,7 @@ queues: submit: true failure: verified: -2 + - name: post manager: IndependentQueueManager trigger: @@ -29,3 +31,38 @@ jobs: failure-message: 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: + - name: stackforge/ceilometer + check: + - gate-ceilometer-merge: + - gate-ceilometer-pep8 + - gate-ceilometer-python26 + - gate-ceilometer-python27 + gate: + - gate-ceilometer-merge: + - gate-ceilometer-pep8 + - gate-ceilometer-python26 + - gate-ceilometer-python27 + + - name: heat-api/heat + check: + - gate-heat-merge: + - gate-heat-pep8 + - gate-heat-python26 + - gate-heat-python27 + gate: + - gate-heat-merge: + - gate-heat-pep8 + - gate-heat-python26 + - gate-heat-python27 + + - name: stackforge/reddwarf + check: + - gate-reddwarf-merge: + - gate-reddwarf-pep8 + - gate-reddwarf-python26 + - gate-reddwarf-python27 + gate: + - gate-reddwarf-merge: + - gate-reddwarf-pep8 + - gate-reddwarf-python26 + - gate-reddwarf-python27