From 839bc3c0b07b7969c833ebcdbf7e10ba2a2dc4aa Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Thu, 13 Jun 2013 10:37:30 -0700
Subject: [PATCH] Rename stackforge/reddwarf to openstack/trove.
Change-Id: I78ca586ce1451e3fa875482d310255b9638dc745
Reviewed-on: https://review.openstack.org/32930
Tested-by: Jenkins
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: James E. Blair <corvus@inaugust.com>
---
doc/source/stackforge.rst | 5 +--
.../files/gerritbot_channel_config.yaml | 13 +++---
.../files/update_gerrit_users.py | 6 +--
.../gerrit/acls/openstack/database-api.config | 15 +++++++
.../acls/openstack/python-troveclient.config | 19 +++++++++
.../trove-integration.config} | 10 ++---
.../trove.config} | 10 ++---
.../acls/stackforge/database-api.config | 16 --------
.../stackforge/python-reddwarfclient.config | 19 ---------
.../jenkins_job_builder/config/projects.yaml | 12 ++++--
.../files/zuul/layout-dev.yaml | 20 +++++-----
.../openstack_project/files/zuul/layout.yaml | 40 +++++++++----------
.../templates/review.projects.yaml.erb | 11 +++--
13 files changed, 99 insertions(+), 97 deletions(-)
create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/database-api.config
create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config
rename modules/openstack_project/files/gerrit/acls/{stackforge/reddwarf-integration.config => openstack/trove-integration.config} (51%)
rename modules/openstack_project/files/gerrit/acls/{stackforge/reddwarf.config => openstack/trove.config} (51%)
delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/database-api.config
delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/python-reddwarfclient.config
diff --git a/doc/source/stackforge.rst b/doc/source/stackforge.rst
index b105656be5..77eee0ddab 100644
--- a/doc/source/stackforge.rst
+++ b/doc/source/stackforge.rst
@@ -199,9 +199,8 @@ for that channel::
- change-merged
- x-vrif-minus-2
projects:
- - stackforge/libra
- - stackforge/python-reddwarfclient
- - stackforge/reddwarf
+ - stackforge/foo
+ - stackforge/python-fooclient
- stackforge/project-name
branches:
- master
diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index fd47e5e1cd..0e82565b33 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -53,9 +53,12 @@ openstack-dev:
- openstack/python-openstackclient
- openstack/python-quantumclient
- openstack/python-swiftclient
+ - openstack/python-troveclient
- openstack/quantum
- openstack/swift
- openstack/tempest
+ - openstack/trove
+ - openstack/trove-integration
- openstack-dev/devstack
- openstack-dev/grenade
- openstack-infra/devstack-gate
@@ -82,8 +85,6 @@ stackforge-dev:
projects:
- stackforge/libra
- stackforge/python-libraclient
- - stackforge/python-reddwarfclient
- - stackforge/reddwarf
branches:
- master
@@ -115,10 +116,10 @@ openstack-trove:
- change-merged
- x-vrif-minus-2
projects:
- - stackforge/reddwarf
- - stackforge/reddwarf-integration
- - stackforge/python-reddwarfclient
- - stackforge/database-api
+ - openstack/trove
+ - openstack/trove-integration
+ - openstack/python-troveclient
+ - openstack/database-api
branches:
- master
diff --git a/modules/launchpad_sync/files/update_gerrit_users.py b/modules/launchpad_sync/files/update_gerrit_users.py
index f8f19c5c81..222a873f70 100755
--- a/modules/launchpad_sync/files/update_gerrit_users.py
+++ b/modules/launchpad_sync/files/update_gerrit_users.py
@@ -283,9 +283,9 @@ class Sync(object):
'stackforge/marconi',
'stackforge/designate',
'stackforge/python-designateclient',
- 'stackforge/python-reddwarfclient',
- 'stackforge/reddwarf',
- 'stackforge/reddwarf-integration',
+ 'openstack/python-troveclient',
+ 'openstack/trove',
+ 'openstack/trove-integration',
]
else:
projects = subprocess.check_output(['/usr/bin/ssh', '-p', '29418',
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/database-api.config b/modules/openstack_project/files/gerrit/acls/openstack/database-api.config
new file mode 100644
index 0000000000..2899c40c6f
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/database-api.config
@@ -0,0 +1,15 @@
+[access]
+ inheritFrom = API-Projects
+[access "refs/*"]
+ owner = group Administrators
+[access "refs/heads/*"]
+ label-Code-Review = -2..+2 group trove-core
+ label-Approved = +0..+1 group trove-core
+ workInProgress = group trove-core
+[project]
+ state = active
+[receive]
+ requireChangeId = true
+ requireContributorAgreement = true
+[submit]
+ mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config
new file mode 100644
index 0000000000..2408807088
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/python-troveclient.config
@@ -0,0 +1,19 @@
+[access "refs/*"]
+ owner = group Administrators
+[access "refs/heads/*"]
+ label-Code-Review = -2..+2 group trove-core
+ label-Approved = +0..+1 group trove-core
+ workInProgress = group trove-core
+[access "refs/heads/milestone-proposed"]
+ label-Code-Review = -2..+2 group trove-milestone
+ label-Approved = +0..+1 group trove-milestone
+[access "refs/tags/*"]
+ create = group trove-ptl
+ pushTag = group trove-ptl
+[project]
+ state = active
+[receive]
+ requireChangeId = true
+ requireContributorAgreement = true
+[submit]
+ mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/reddwarf-integration.config b/modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config
similarity index 51%
rename from modules/openstack_project/files/gerrit/acls/stackforge/reddwarf-integration.config
rename to modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config
index c8e5dc35dc..4f0958b294 100644
--- a/modules/openstack_project/files/gerrit/acls/stackforge/reddwarf-integration.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/trove-integration.config
@@ -1,12 +1,12 @@
[access "refs/*"]
owner = group Administrators
[access "refs/heads/*"]
- label-Code-Review = -2..+2 group reddwarf-core
- label-Approved = +0..+1 group reddwarf-core
- workInProgress = group reddwarf-core
+ label-Code-Review = -2..+2 group trove-core
+ label-Approved = +0..+1 group trove-core
+ workInProgress = group trove-core
[access "refs/heads/milestone-proposed"]
- label-Code-Review = -2..+2 group reddwarf-core
- label-Approved = +0..+1 group reddwarf-core
+ label-Code-Review = -2..+2 group trove-milestone
+ label-Approved = +0..+1 group trove-milestone
[project]
state = active
[receive]
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/reddwarf.config b/modules/openstack_project/files/gerrit/acls/openstack/trove.config
similarity index 51%
rename from modules/openstack_project/files/gerrit/acls/stackforge/reddwarf.config
rename to modules/openstack_project/files/gerrit/acls/openstack/trove.config
index c8e5dc35dc..4f0958b294 100644
--- a/modules/openstack_project/files/gerrit/acls/stackforge/reddwarf.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/trove.config
@@ -1,12 +1,12 @@
[access "refs/*"]
owner = group Administrators
[access "refs/heads/*"]
- label-Code-Review = -2..+2 group reddwarf-core
- label-Approved = +0..+1 group reddwarf-core
- workInProgress = group reddwarf-core
+ label-Code-Review = -2..+2 group trove-core
+ label-Approved = +0..+1 group trove-core
+ workInProgress = group trove-core
[access "refs/heads/milestone-proposed"]
- label-Code-Review = -2..+2 group reddwarf-core
- label-Approved = +0..+1 group reddwarf-core
+ label-Code-Review = -2..+2 group trove-milestone
+ label-Approved = +0..+1 group trove-milestone
[project]
state = active
[receive]
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/database-api.config b/modules/openstack_project/files/gerrit/acls/stackforge/database-api.config
deleted file mode 100644
index 8ebd6aebdb..0000000000
--- a/modules/openstack_project/files/gerrit/acls/stackforge/database-api.config
+++ /dev/null
@@ -1,16 +0,0 @@
-[access "refs/*"]
- owner = group Administrators
-[access "refs/heads/*"]
- label-Code-Review = -2..+2 group reddwarf-doc-core
- label-Approved = +0..+1 group reddwarf-doc-core
- workInProgress = group reddwarf-doc-core
-[access "refs/heads/milestone-proposed"]
- label-Code-Review = -2..+2 group reddwarf-doc-core
- label-Approved = +0..+1 group reddwarf-doc-core
-[project]
- state = active
-[receive]
- requireChangeId = true
- requireContributorAgreement = true
-[submit]
- mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-reddwarfclient.config b/modules/openstack_project/files/gerrit/acls/stackforge/python-reddwarfclient.config
deleted file mode 100644
index 1b83db2aa5..0000000000
--- a/modules/openstack_project/files/gerrit/acls/stackforge/python-reddwarfclient.config
+++ /dev/null
@@ -1,19 +0,0 @@
-[access "refs/*"]
- owner = group Administrators
-[access "refs/heads/*"]
- label-Code-Review = -2..+2 group reddwarf-core
- label-Approved = +0..+1 group reddwarf-core
- workInProgress = group reddwarf-core
-[access "refs/heads/milestone-proposed"]
- label-Code-Review = -2..+2 group reddwarf-core
- label-Approved = +0..+1 group reddwarf-core
-[access "refs/tags/*"]
- create = group reddwarf-core
- pushTag = group reddwarf-core
-[project]
- state = active
-[receive]
- requireChangeId = true
- requireContributorAgreement = true
-[submit]
- mergeContent = true
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 ace5fa6275..2939d77ca6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -608,23 +608,27 @@
- project:
- name: reddwarf
- github-org: stackforge
+ name: trove
+ github-org: openstack
tarball-site: tarballs.openstack.org
+ doc-publisher-site: docs.openstack.org
node: precise
jobs:
- python-jobs
+ - openstack-publish-jobs
- project:
- name: python-reddwarfclient
- github-org: stackforge
+ name: python-troveclient
+ github-org: openstack
tarball-site: tarballs.openstack.org
+ doc-publisher-site: docs.openstack.org
node: precise
jobs:
- python-jobs
+ - openstack-publish-jobs
- pypi-jobs
diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml
index ea8d9ddade..09f34814d9 100644
--- a/modules/openstack_project/files/zuul/layout-dev.yaml
+++ b/modules/openstack_project/files/zuul/layout-dev.yaml
@@ -467,21 +467,21 @@ projects:
check:
- gate-noop
- - name: stackforge/reddwarf
+ - name: openstack/trove
check:
- - gate-reddwarf-pep8
- - gate-reddwarf-python26
- - gate-reddwarf-python27
+ - gate-trove-pep8
+ - gate-trove-python26
+ - gate-trove-python27
- - name: stackforge/reddwarf-integration
+ - name: openstack/trove-integration
check:
- gate-noop
- - name: stackforge/python-reddwarfclient
+ - name: openstack/python-troveclient
check:
- - gate-python-reddwarfclient-pep8
- - gate-python-reddwarfclient-python26
- - gate-python-reddwarfclient-python27
+ - gate-python-troveclient-pep8
+ - gate-python-troveclient-python26
+ - gate-python-troveclient-python27
- name: stackforge/marconi
check:
@@ -620,7 +620,7 @@ projects:
check:
- gate-zmq-event-publisher-build
- - name: stackforge/database-api
+ - name: openstack/database-api
check:
- gate-noop
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d8c3a0648d..23a5dd5bee 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1153,38 +1153,38 @@ projects:
gate:
- gate-noop
- - name: stackforge/reddwarf
+ - name: openstack/trove
check:
- - gate-reddwarf-pep8
- - gate-reddwarf-python26
- - gate-reddwarf-python27
+ - gate-trove-pep8
+ - gate-trove-python26
+ - gate-trove-python27
gate:
- - gate-reddwarf-pep8
- - gate-reddwarf-python26
- - gate-reddwarf-python27
+ - gate-trove-pep8
+ - gate-trove-python26
+ - gate-trove-python27
post:
- - reddwarf-coverage
+ - trove-coverage
- - name: stackforge/reddwarf-integration
+ - name: openstack/trove-integration
check:
- gate-noop
gate:
- gate-noop
- - name: stackforge/python-reddwarfclient
+ - name: openstack/python-troveclient
check:
- - gate-python-reddwarfclient-pep8
- - gate-python-reddwarfclient-python26
- - gate-python-reddwarfclient-python27
+ - gate-python-troveclient-pep8
+ - gate-python-troveclient-python26
+ - gate-python-troveclient-python27
gate:
- - gate-python-reddwarfclient-pep8
- - gate-python-reddwarfclient-python26
- - gate-python-reddwarfclient-python27
+ - gate-python-troveclient-pep8
+ - gate-python-troveclient-python26
+ - gate-python-troveclient-python27
pre-release:
- - python-reddwarfclient-tarball
+ - python-troveclient-tarball
release:
- - python-reddwarfclient-tarball:
- - python-reddwarfclient-pypi-upload
+ - python-troveclient-tarball:
+ - python-troveclient-pypi-upload
- name: stackforge/marconi
check:
@@ -1540,7 +1540,7 @@ projects:
post:
- zmq-event-publisher-hpi-artifact
- - name: stackforge/database-api
+ - name: openstack/database-api
check:
- gate-noop
gate:
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 99a0b56703..5f793fa2d7 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -131,10 +131,9 @@
upstream: git://github.com/billingstack/billingstack
description: Billing software
- project: stackforge/python-designateclient
-- project: stackforge/python-reddwarfclient
-- project: stackforge/reddwarf
-- project: stackforge/reddwarf-integration
- upstream: git://github.com/hub-cap/reddwarf_lite-integration.git
+- project: openstack/python-troveclient
+- project: openstack/trove
+- project: openstack/trove-integration
- project: stackforge/bufunfa
upstream: git://github.com/ekarlso/bufunfa.git
- project: stackforge/kwapi
@@ -148,8 +147,8 @@
- project: stackforge/packstack
description: Install utility to deploy openstack on multiple hosts.
upstream: git://github.com/fedora-openstack/packstack.git
-- project: stackforge/database-api
- description: Doc repo for reddwarf project
+- project: openstack/database-api
+ description: Doc repo for trove project
- project: stackforge/anvil
description: "A set of python scripts and utilities to forge raw openstack into a productive tool!"
upstream: git://github.com/yahoo/Openstack-Anvil.git