From 207c0d925e645ce8216932a1b6dfc79d008f9425 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 29 Aug 2014 19:20:21 +0000 Subject: [PATCH] Move manila repos from stackforge to openstack According to openstack/governance change I8010cd03c4d409a7a0532f7963a55b8456877ae1 the acceptance of the Shared File Systems program's application on August 26 implies its projects' Git repositories should be within the official namespace. Change-Id: I41c13866fb085d5833cedaec9b14ed3e3396f5a0 --- .../files/gerritbot_channel_config.yaml | 4 +- .../{stackforge => openstack}/manila.config | 0 .../python-manilaclient.config | 0 .../jenkins_job_builder/config/manila.yaml | 12 +-- .../files/review.projects.yaml | 8 +- .../openstack_project/files/zuul/layout.yaml | 82 +++++++++---------- 6 files changed, 52 insertions(+), 54 deletions(-) rename modules/openstack_project/files/gerrit/acls/{stackforge => openstack}/manila.config (100%) rename modules/openstack_project/files/gerrit/acls/{stackforge => openstack}/python-manilaclient.config (100%) diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 3cbe2c1fd0..d24256c9ae 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -667,8 +667,8 @@ openstack-manila: - change-merged - x-vrif-minus-2 projects: - - stackforge/manila - - stackforge/python-manilaclient + - openstack/manila + - openstack/python-manilaclient branches: - master diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/manila.config b/modules/openstack_project/files/gerrit/acls/openstack/manila.config similarity index 100% rename from modules/openstack_project/files/gerrit/acls/stackforge/manila.config rename to modules/openstack_project/files/gerrit/acls/openstack/manila.config diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-manilaclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-manilaclient.config similarity index 100% rename from modules/openstack_project/files/gerrit/acls/stackforge/python-manilaclient.config rename to modules/openstack_project/files/gerrit/acls/openstack/python-manilaclient.config diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml index fce6db668c..e4be852d80 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml @@ -17,8 +17,8 @@ export DEVSTACK_GATE_TIMEOUT=35 export DEVSTACK_GATE_NEUTRON=1 export ENABLED_SERVICES=manila,m-api,m-shr,m-sch - export PROJECTS="stackforge/manila $PROJECTS" - export PROJECTS="stackforge/python-manilaclient $PROJECTS" + export PROJECTS="openstack/manila $PROJECTS" + export PROJECTS="openstack/python-manilaclient $PROJECTS" # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 @@ -56,8 +56,8 @@ export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_NEUTRON=1 export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest - export PROJECTS="stackforge/manila $PROJECTS" - export PROJECTS="stackforge/python-manilaclient $PROJECTS" + export PROJECTS="openstack/manila $PROJECTS" + export PROJECTS="openstack/python-manilaclient $PROJECTS" # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 @@ -100,8 +100,8 @@ export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_NEUTRON=1 export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest - export PROJECTS="stackforge/manila $PROJECTS" - export PROJECTS="stackforge/python-manilaclient $PROJECTS" + export PROJECTS="openstack/manila $PROJECTS" + export PROJECTS="openstack/python-manilaclient $PROJECTS" # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 91572cd9ae..747e8243c5 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -312,6 +312,8 @@ upstream: git://github.com/morganfainberg/keystonemiddleware - project: openstack/kite description: A service for managing and distributing message encryption keys. +- project: openstack/manila + description: Shared filesystem management project for OpenStack. - project: openstack/netconn-api group: openstack-api-site options: @@ -442,6 +444,7 @@ - project: openstack/python-keystoneclient - project: openstack/python-kiteclient description: Python bindings to Kite. +- project: openstack/python-manilaclient - project: openstack/python-neutronclient docimpact-group: openstack-manuals - project: openstack/python-novaclient @@ -870,9 +873,6 @@ - project: stackforge/magnetodb description: Key-value database service for OpenStack cloud. upstream: git://github.com/Mirantis/magnetodb.git -- project: stackforge/manila - description: Shared filesystem management project for OpenStack. - upstream: git://github.com/bswartz/manila.git - project: stackforge/merlin description: Framework for building UIs for OpenStack projects dealing with complex input data - project: stackforge/milk @@ -1134,8 +1134,6 @@ - project: stackforge/python-magnetodbclient description: Python client for MagnetoDB, the key-value database service for OpenStack cloud. upstream: git://github.com/aostapenko/python-magnetodbclient -- project: stackforge/python-manilaclient - upstream: git://github.com/bswartz/python-manilaclient.git - project: stackforge/python-mistralclient description: Python client for Mistral REST API. group: mistral diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 1a5d550248..81b9293c70 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1162,6 +1162,28 @@ projects: release: - kite-tarball + - name: openstack/manila + template: + - name: merge-check + check: + - gate-manila-devstack-dsvm-neutron + - gate-manila-docs + - gate-manila-pep8 + - gate-manila-pylint + - gate-manila-python26 + - gate-manila-python27 + - gate-manila-tempest-dsvm-neutron + - gate-manila-tempest-dsvm-neutron-multibackend + gate: + - gate-manila-devstack-dsvm-neutron + - gate-manila-docs + - gate-manila-pep8 + - gate-manila-python26 + - gate-manila-python27 + post: + - manila-branch-tarball + - manila-coverage + - name: openstack/zaqar template: - name: merge-check @@ -1633,6 +1655,25 @@ projects: gate: - gate-python-kiteclient-requirements + - name: openstack/python-manilaclient + template: + - name: merge-check + - name: python3-jobs + check: + - gate-python-manilaclient-docs + - gate-python-manilaclient-pep8 + - gate-python-manilaclient-python26 + - gate-python-manilaclient-python27 + - gate-manila-tempest-dsvm-neutron + gate: + - gate-python-manilaclient-docs + - gate-python-manilaclient-pep8 + - gate-python-manilaclient-python26 + - gate-python-manilaclient-python27 + post: + - python-manilaclient-branch-tarball + - python-manilaclient-coverage + - name: openstack/python-zaqarclient template: - name: merge-check @@ -3995,28 +4036,6 @@ projects: check: - logaas-coverage - - name: stackforge/manila - template: - - name: merge-check - check: - - gate-manila-devstack-dsvm-neutron - - gate-manila-docs - - gate-manila-pep8 - - gate-manila-pylint - - gate-manila-python26 - - gate-manila-python27 - - gate-manila-tempest-dsvm-neutron - - gate-manila-tempest-dsvm-neutron-multibackend - gate: - - gate-manila-devstack-dsvm-neutron - - gate-manila-docs - - gate-manila-pep8 - - gate-manila-python26 - - gate-manila-python27 - post: - - manila-branch-tarball - - manila-coverage - - name: stackforge/merlin template: - name: merge-check @@ -4648,25 +4667,6 @@ projects: release: - python-magnetodbclient-tarball - - name: stackforge/python-manilaclient - template: - - name: merge-check - - name: python3-jobs - check: - - gate-python-manilaclient-docs - - gate-python-manilaclient-pep8 - - gate-python-manilaclient-python26 - - gate-python-manilaclient-python27 - - gate-manila-tempest-dsvm-neutron - gate: - - gate-python-manilaclient-docs - - gate-python-manilaclient-pep8 - - gate-python-manilaclient-python26 - - gate-python-manilaclient-python27 - post: - - python-manilaclient-branch-tarball - - python-manilaclient-coverage - - name: stackforge/python-monascaclient template: - name: merge-check