From fa6b9be9ecdf58f1931d7e3c702b58da90d02f82 Mon Sep 17 00:00:00 2001 From: Flaper Fesp Date: Wed, 4 Sep 2013 00:25:07 +0200 Subject: [PATCH] Move marconi under openstack Marconi was recently accepted as an incubated project and as part of its incubation, it's being moved under the openstack organization. Meeting logs: http://eavesdrop.openstack.org/meetings/tc/2013/tc.2013-09-03-20.01.html Change-Id: Ie7c40be5f9cb3bdaec8dfcdf5f4c0f5e26b1ebad --- .../files/gerritbot_channel_config.yaml | 4 ++-- .../files/update_gerrit_users.py | 2 +- .../{stackforge => openstack}/marconi.config | 0 .../python-marconiclient.config | 0 .../jenkins_job_builder/config/projects.yaml | 20 +++++++++---------- .../files/zuul/layout-dev.yaml | 4 ++-- .../openstack_project/files/zuul/layout.yaml | 4 ++-- .../templates/review.projects.yaml.erb | 4 ++-- 8 files changed, 18 insertions(+), 20 deletions(-) rename modules/openstack_project/files/gerrit/acls/{stackforge => openstack}/marconi.config (100%) rename modules/openstack_project/files/gerrit/acls/{stackforge => openstack}/python-marconiclient.config (100%) diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 02ec89c509..780f0e5d75 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -329,7 +329,7 @@ openstack-marconi: - change-merged - x-vrif-minus-2 projects: - - stackforge/marconi - - stackforge/python-marconiclient + - openstack/marconi + - openstack/python-marconiclient branches: - master diff --git a/modules/launchpad_sync/files/update_gerrit_users.py b/modules/launchpad_sync/files/update_gerrit_users.py index 6850d57659..97ade8d802 100755 --- a/modules/launchpad_sync/files/update_gerrit_users.py +++ b/modules/launchpad_sync/files/update_gerrit_users.py @@ -280,7 +280,7 @@ class Sync(object): 'stackforge/bufunfa', 'openstack/diskimage-builder', 'stackforge/libra', - 'stackforge/marconi', + 'openstack/marconi', 'stackforge/designate', 'stackforge/python-designateclient', 'openstack/python-troveclient', diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/marconi.config b/modules/openstack_project/files/gerrit/acls/openstack/marconi.config similarity index 100% rename from modules/openstack_project/files/gerrit/acls/stackforge/marconi.config rename to modules/openstack_project/files/gerrit/acls/openstack/marconi.config diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-marconiclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.config similarity index 100% rename from modules/openstack_project/files/gerrit/acls/stackforge/python-marconiclient.config rename to modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.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 eecc0c472c..619d93ce0b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -744,16 +744,23 @@ jobs: - python-jobs - - project: name: marconi - github-org: stackforge + github-org: openstack tarball-site: tarballs.openstack.org node: precise jobs: - python-jobs +- project: + name: python-marconiclient + github-org: openstack + tarball-site: tarballs.openstack.org + node: precise + + jobs: + - python-jobs - project: name: designate @@ -1082,15 +1089,6 @@ - gate-{name}-puppet-syntax - puppet-module-unit -- project: - name: python-marconiclient - github-org: stackforge - tarball-site: tarballs.openstack.org - node: precise - - jobs: - - python-jobs - - project: name: cookbook-openstack-common github-org: stackforge diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml index 31a099e985..9d6d247d26 100644 --- a/modules/openstack_project/files/zuul/layout-dev.yaml +++ b/modules/openstack_project/files/zuul/layout-dev.yaml @@ -492,7 +492,7 @@ projects: - gate-python-troveclient-python26 - gate-python-troveclient-python27 - - name: stackforge/marconi + - name: openstack/marconi check: - gate-marconi-pep8 - gate-marconi-python26 @@ -723,7 +723,7 @@ projects: check: - gate-noop - - name: stackforge/python-marconiclient + - name: openstack/python-marconiclient check: - gate-python-marconiclient-pep8 - gate-python-marconiclient-python26 diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 7580bab42a..a4d187e980 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1803,7 +1803,7 @@ projects: - post-mirror-python27 - post-mirror-python33 - - name: stackforge/marconi + - name: openstack/marconi check: - gate-marconi-pep8 - gate-marconi-python26 @@ -2707,7 +2707,7 @@ projects: gate: - gate-noop - - name: stackforge/python-marconiclient + - name: openstack/python-marconiclient check: - gate-python-marconiclient-pep8 - gate-python-marconiclient-python26 diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index 6e950be1fa..cf725b677c 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -147,7 +147,7 @@ upstream: git://github.com/healthnmon/healthnmon.git - project: stackforge/libra - project: stackforge/python-libraclient -- project: stackforge/marconi +- project: openstack/marconi - project: stackforge/staccato description: VM Image Transfer Service upstream: git://github.com/buzztroll/staccato.git @@ -265,7 +265,7 @@ - project: stackforge/openvz-nova-driver description: OpenVz driver for Nova upstream: git://github.com/imsplitbit/openvz-nova-driver.git -- project: stackforge/python-marconiclient +- project: openstack/python-marconiclient - project: stackforge/openstack-chef-repo description: Example Chef Repo that sets up an OpenStack Deployment acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config