From daf27aeff160faef08d09f9bd19d60895242d0e4 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 31 Jan 2014 12:23:23 -0800 Subject: [PATCH] Oslo is adopting several stackforge libraries The stackforge repositories for cliff, stevedore, taskflow, and pycadf need to move under the openstack branded area of the git server and CI system. Change-Id: I08824ab75a285f0b50db1e6c5208feebeb6048b9 --- .../files/gerritbot_channel_config.yaml | 2 +- .../{stackforge => openstack}/cliff.config | 2 +- .../{stackforge => openstack}/pycadf.config | 0 .../stevedore.config | 2 +- .../{stackforge => openstack}/taskflow.config | 0 .../jenkins_job_builder/config/projects.yaml | 8 +- .../files/review.projects.yaml | 23 +- .../openstack_project/files/zuul/layout.yaml | 226 +++++++++--------- 8 files changed, 130 insertions(+), 133 deletions(-) rename modules/openstack_project/files/gerrit/acls/{stackforge => openstack}/cliff.config (89%) rename modules/openstack_project/files/gerrit/acls/{stackforge => openstack}/pycadf.config (100%) rename modules/openstack_project/files/gerrit/acls/{stackforge => openstack}/stevedore.config (89%) rename modules/openstack_project/files/gerrit/acls/{stackforge => openstack}/taskflow.config (100%) diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index d441d4727f..05e3829834 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -333,7 +333,7 @@ openstack-state-management: - change-merged - x-vrif-minus-2 projects: - - stackforge/taskflow + - openstack/taskflow branches: - master diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/cliff.config b/modules/openstack_project/files/gerrit/acls/openstack/cliff.config similarity index 89% rename from modules/openstack_project/files/gerrit/acls/stackforge/cliff.config rename to modules/openstack_project/files/gerrit/acls/openstack/cliff.config index 47b85354f0..d24cc57a68 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/cliff.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/cliff.config @@ -9,6 +9,6 @@ state = active [receive] requireChangeId = true - requireContributorAgreement = false + requireContributorAgreement = true [submit] mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/pycadf.config b/modules/openstack_project/files/gerrit/acls/openstack/pycadf.config similarity index 100% rename from modules/openstack_project/files/gerrit/acls/stackforge/pycadf.config rename to modules/openstack_project/files/gerrit/acls/openstack/pycadf.config diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/stevedore.config b/modules/openstack_project/files/gerrit/acls/openstack/stevedore.config similarity index 89% rename from modules/openstack_project/files/gerrit/acls/stackforge/stevedore.config rename to modules/openstack_project/files/gerrit/acls/openstack/stevedore.config index 3c4a6bf6df..392515305b 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/stevedore.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/stevedore.config @@ -9,6 +9,6 @@ state = active [receive] requireChangeId = true - requireContributorAgreement = false + requireContributorAgreement = true [submit] mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/taskflow.config b/modules/openstack_project/files/gerrit/acls/openstack/taskflow.config similarity index 100% rename from modules/openstack_project/files/gerrit/acls/stackforge/taskflow.config rename to modules/openstack_project/files/gerrit/acls/openstack/taskflow.config diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index b493f723a0..5376ba8c9a 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1659,7 +1659,7 @@ - project: name: taskflow - github-org: stackforge + github-org: openstack node: precise tarball-site: tarballs.openstack.org @@ -1709,7 +1709,7 @@ - project: name: pycadf - github-org: stackforge + github-org: openstack node: precise tarball-site: tarballs.openstack.org @@ -1742,7 +1742,7 @@ - project: name: stevedore - github-org: stackforge + github-org: openstack node: precise rtfd-id: 4157 tarball-site: tarballs.openstack.org @@ -1754,7 +1754,7 @@ - project: name: cliff - github-org: stackforge + github-org: openstack node: precise tarball-site: tarballs.openstack.org diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 416b6ee9da..1b2a7546bf 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -160,6 +160,9 @@ - project: openstack/ceilometer - project: openstack/cinder docimpact-group: openstack-manuals +- project: openstack/cliff + description: Command Line Interface Formulation Framework + group: python-cliff - project: openstack/compute-api group: openstack-api-site - project: openstack/database-api @@ -241,6 +244,8 @@ - project: openstack/oslo.version docimpact-group: openstack-manuals upstream: git://github.com/emonty/oslo.version.git +- project: openstack/pycadf + description: CADF Python module - project: openstack/python-ceilometerclient upstream: git://github.com/asalkeld/python-ceilometerclient.git - project: openstack/python-cinderclient @@ -286,11 +291,16 @@ group: savanna description: Disk image elements for Savanna acl-config: /home/gerrit2/acls/openstack/savanna.config +- project: openstack/stevedore + group: python-stevedore + description: Manage dynamic plugins for Python applications - project: openstack/swift docimpact-group: openstack-manuals - project: openstack/swift-bench description: Benchmarking tool for OpenStack Swift upstream: git://github.com/jeblair/swift-bench.git +- project: openstack/taskflow + description: A library to complete workflows/tasks in HA manner - project: openstack/tempest options: - direct-release @@ -338,10 +348,6 @@ - project: stackforge/cl-openstack-client description: Common Lisp OpenStack client libraries upstream: git://github.com/jd/cl-openstack-client.git -- project: stackforge/cliff - description: Command Line Interface Formulation Framework - upstream: git://github.com/dreamhost/cliff.git - group: python-cliff - project: stackforge/climate description: Reservation Service for OpenStack upstream: git://github.com/jd/climate.git @@ -675,8 +681,6 @@ upstream: git://github.com/CiscoSystems/puppet_openstack_builder description: Data model for deploying multiple openstack reference architectures acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config -- project: stackforge/pycadf - description: CADF Python module - project: stackforge/pyghmi description: A Pure python IPMI library upstream: git://git.code.sf.net/p/xcat/python-ipmi @@ -729,17 +733,10 @@ - project: stackforge/stackalytics description: OpenStack analytics dashboard upstream: git://github.com/Mirantis/stackalytics.git -- project: stackforge/stevedore - group: python-stevedore - description: Manage dynamic plugins for Python applications - upstream: git://github.com/dreamhost/stevedore.git - project: stackforge/swiftsync description: "Swift mass syncronizer" upstream: git://github.com/enovance/swiftsync.git acl-config: /home/gerrit2/acls/openstack/swiftsync.config -- project: stackforge/taskflow - description: A library to complete workflows/tasks in HA manner - upstream: git://github.com/yahoo/TaskFlow - project: stackforge/tomograph description: "Library to help distributed applications send trace information to metrics backends like Zipkin and Statsd." upstream: https://github.com/timjr/tomograph.git diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index b7f23eee84..25dd2778cc 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -550,6 +550,41 @@ projects: periodic: - cinder-propose-translation-update + - name: openstack/cliff + check: + - gate-cliff-pep8 + - gate-cliff-python26 + - gate-cliff-python27 + - gate-cliff-python33 + - gate-cliff-pypy + - gate-cliff-tox-neutronclient-stable + - gate-cliff-tox-neutronclient-tip + - gate-cliff-tox-openstackclient-stable + - gate-cliff-tox-openstackclient-tip + gate: + - gate-cliff-pep8 + - gate-cliff-python26 + - gate-cliff-python27 + - gate-cliff-python33 + - gate-cliff-pypy + - gate-cliff-tox-neutronclient-stable + - gate-cliff-tox-neutronclient-tip + - gate-cliff-tox-openstackclient-stable + - gate-cliff-tox-openstackclient-tip + post: + - cliff-branch-tarball + - hook-cliff-rtfd + pre-release: + - cliff-tarball + - hook-cliff-rtfd + release: + - cliff-tarball: + - cliff-pypi-upload: + - post-mirror-python26 + - post-mirror-python27 + - post-mirror-python33 + - hook-cliff-rtfd + - name: openstack/gantt template: - name: python-jobs @@ -850,6 +885,28 @@ projects: periodic: - nova-propose-translation-update + - name: openstack/pycadf + check: + - gate-pycadf-pep8 + - gate-pycadf-python26 + - gate-pycadf-python27 + - gate-pycadf-python33 + gate: + - gate-pycadf-pep8 + - gate-pycadf-python26 + - gate-pycadf-python27 + - gate-pycadf-python33 + post: + - pycadf-branch-tarball + pre-release: + - pycadf-tarball + release: + - pycadf-tarball: + - pycadf-pypi-upload: + - post-mirror-python26 + - post-mirror-python27 + - post-mirror-python33 + - name: openstack/savanna template: - name: python-jobs @@ -882,6 +939,31 @@ projects: periodic: - savanna-propose-translation-update + - name: openstack/stevedore + check: + - gate-stevedore-pep8 + - gate-stevedore-python26 + - gate-stevedore-python27 + - gate-stevedore-python33 + gate: + - gate-stevedore-pep8 + - gate-stevedore-python26 + - gate-stevedore-python27 + - gate-stevedore-python33 + post: + - stevedore-branch-tarball + - hook-stevedore-rtfd + pre-release: + - stevedore-tarball + - hook-stevedore-rtfd + release: + - stevedore-tarball: + - stevedore-pypi-upload: + - post-mirror-python26 + - post-mirror-python27 + - post-mirror-python33 + - hook-stevedore-rtfd + - name: openstack/swift template: - name: python-jobs @@ -913,6 +995,37 @@ projects: - swift-tarball - swift-merge-release-tags + - name: openstack/taskflow + check: + - gate-taskflow-pep8 + - gate-taskflow-python26 + - gate-taskflow-python27 + - gate-taskflow-python33 + - gate-taskflow-tox-py26-sa7-mysql + - gate-taskflow-tox-py27-sa8-mysql + - gate-taskflow-tox-py26-sa9-mysql + - gate-taskflow-tox-py27-sa9-mysql + gate: + - gate-taskflow-pep8 + - gate-taskflow-python26 + - gate-taskflow-python27 + - gate-taskflow-python33 + - gate-taskflow-tox-py26-sa7-mysql + - gate-taskflow-tox-py27-sa8-mysql + - gate-taskflow-tox-py26-sa9-mysql + - gate-taskflow-tox-py27-sa9-mysql + post: + - taskflow-coverage + - taskflow-branch-tarball + pre-release: + - taskflow-tarball + release: + - taskflow-tarball: + - taskflow-pypi-upload: + - post-mirror-python26 + - post-mirror-python27 + - post-mirror-python33 + - name: openstack/trove template: - name: python-jobs @@ -2796,41 +2909,6 @@ projects: post: - hook-bufunfa-rtfd - - name: stackforge/cliff - check: - - gate-cliff-pep8 - - gate-cliff-python26 - - gate-cliff-python27 - - gate-cliff-python33 - - gate-cliff-pypy - - gate-cliff-tox-neutronclient-stable - - gate-cliff-tox-neutronclient-tip - - gate-cliff-tox-openstackclient-stable - - gate-cliff-tox-openstackclient-tip - gate: - - gate-cliff-pep8 - - gate-cliff-python26 - - gate-cliff-python27 - - gate-cliff-python33 - - gate-cliff-pypy - - gate-cliff-tox-neutronclient-stable - - gate-cliff-tox-neutronclient-tip - - gate-cliff-tox-openstackclient-stable - - gate-cliff-tox-openstackclient-tip - post: - - cliff-branch-tarball - - hook-cliff-rtfd - pre-release: - - cliff-tarball - - hook-cliff-rtfd - release: - - cliff-tarball: - - cliff-pypi-upload: - - post-mirror-python26 - - post-mirror-python27 - - post-mirror-python33 - - hook-cliff-rtfd - - name: stackforge/climate check: - gate-climate-pep8 @@ -3762,28 +3840,6 @@ projects: - gate-puppet-vswitch-puppet-unit-2.7 - gate-puppet-vswitch-puppet-unit-3.1 - - name: stackforge/pycadf - check: - - gate-pycadf-pep8 - - gate-pycadf-python26 - - gate-pycadf-python27 - - gate-pycadf-python33 - gate: - - gate-pycadf-pep8 - - gate-pycadf-python26 - - gate-pycadf-python27 - - gate-pycadf-python33 - post: - - pycadf-branch-tarball - pre-release: - - pycadf-tarball - release: - - pycadf-tarball: - - pycadf-pypi-upload: - - post-mirror-python26 - - post-mirror-python27 - - post-mirror-python33 - - name: stackforge/pyghmi check: - gate-pyghmi-pep8 @@ -4052,31 +4108,6 @@ projects: - stackalytics-tarball - hook-stackalytics-rtfd - - name: stackforge/stevedore - check: - - gate-stevedore-pep8 - - gate-stevedore-python26 - - gate-stevedore-python27 - - gate-stevedore-python33 - gate: - - gate-stevedore-pep8 - - gate-stevedore-python26 - - gate-stevedore-python27 - - gate-stevedore-python33 - post: - - stevedore-branch-tarball - - hook-stevedore-rtfd - pre-release: - - stevedore-tarball - - hook-stevedore-rtfd - release: - - stevedore-tarball: - - stevedore-pypi-upload: - - post-mirror-python26 - - post-mirror-python27 - - post-mirror-python33 - - hook-stevedore-rtfd - - name: stackforge/swiftsync check: - gate-swiftsync-pep8 @@ -4091,37 +4122,6 @@ projects: release: - swiftsync-tarball - - name: stackforge/taskflow - check: - - gate-taskflow-pep8 - - gate-taskflow-python26 - - gate-taskflow-python27 - - gate-taskflow-python33 - - gate-taskflow-tox-py26-sa7-mysql - - gate-taskflow-tox-py27-sa8-mysql - - gate-taskflow-tox-py26-sa9-mysql - - gate-taskflow-tox-py27-sa9-mysql - gate: - - gate-taskflow-pep8 - - gate-taskflow-python26 - - gate-taskflow-python27 - - gate-taskflow-python33 - - gate-taskflow-tox-py26-sa7-mysql - - gate-taskflow-tox-py27-sa8-mysql - - gate-taskflow-tox-py26-sa9-mysql - - gate-taskflow-tox-py27-sa9-mysql - post: - - taskflow-coverage - - taskflow-branch-tarball - pre-release: - - taskflow-tarball - release: - - taskflow-tarball: - - taskflow-pypi-upload: - - post-mirror-python26 - - post-mirror-python27 - - post-mirror-python33 - - name: stackforge/tomograph check: - gate-tomograph-pep8