From 0c2dba367fcf7e7d9acea23081ab1f2ca1a92ea3 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Wed, 2 Oct 2013 09:30:27 +1300
Subject: [PATCH] Move tuskar to openstack.
Tuskar is part of TripleO now, so should be on openstack, and use the
same IRC channel.
Change-Id: I9bb037c31e192f1d719cfdd3a1d59053eba0c5b0
---
.../files/gerritbot_channel_config.yaml | 21 ++++++-------------
.../acls/openstack/python-tuskarclient.config | 12 +++++++++++
.../gerrit/acls/openstack/tuskar-ui.config | 12 +++++++++++
.../files/gerrit/acls/openstack/tuskar.config | 12 +++++++++++
.../stackforge/python-tuskarclient.config | 12 -----------
.../gerrit/acls/stackforge/tuskar-ui.config | 12 -----------
.../gerrit/acls/stackforge/tuskar.config | 12 -----------
.../jenkins_job_builder/config/projects.yaml | 4 ++--
.../openstack_project/files/zuul/layout.yaml | 6 +++---
.../templates/review.projects.yaml.erb | 6 +++---
10 files changed, 50 insertions(+), 59 deletions(-)
create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/python-tuskarclient.config
create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/tuskar-ui.config
create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/tuskar.config
delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/python-tuskarclient.config
delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/tuskar-ui.config
delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/tuskar.config
diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 6f892b83b2..3d8b5c174a 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -100,14 +100,17 @@ tripleo:
- change-merged
- x-vrif-minus-2
projects:
+ - openstack-infra/tripleo-ci
- openstack/diskimage-builder
- - openstack/os-collect-config
- openstack/os-apply-config
+ - openstack/os-collect-config
- openstack/os-refresh-config
+ - openstack/python-tuskarclient
+ - openstack/tripleo-heat-templates
- openstack/tripleo-image-elements
- openstack/tripleo-incubator
- - openstack/tripleo-heat-templates
- - openstack-infra/tripleo-ci
+ - openstack/tuskar
+ - openstack/tuskar-ui
branches:
- master
@@ -306,18 +309,6 @@ openstack-glance:
branches:
- master
-tuskar:
- events:
- - patchset-created
- - change-merged
- - x-vrif-minus-2
- projects:
- - stackforge/tuskar
- - stackforge/tuskar-ui
- - stackforge/python-tuskarclient
- branches:
- - master
-
openstack-marconi:
events:
- patchset-created
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-tuskarclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-tuskarclient.config
new file mode 100644
index 0000000000..6a4820ce44
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/python-tuskarclient.config
@@ -0,0 +1,12 @@
+[access "refs/heads/*"]
+ label-Code-Review = -2..+2 group tripleo-core
+ label-Approved = +0..+1 group tripleo-core
+ workInProgress = group tripleo-core
+[access "refs/tags/*"]
+ create = group tripleo-core
+ pushTag = group tripleo-core
+[receive]
+ requireChangeId = true
+ requireContributorAgreement = true
+[submit]
+ mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tuskar-ui.config b/modules/openstack_project/files/gerrit/acls/openstack/tuskar-ui.config
new file mode 100644
index 0000000000..6a4820ce44
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/tuskar-ui.config
@@ -0,0 +1,12 @@
+[access "refs/heads/*"]
+ label-Code-Review = -2..+2 group tripleo-core
+ label-Approved = +0..+1 group tripleo-core
+ workInProgress = group tripleo-core
+[access "refs/tags/*"]
+ create = group tripleo-core
+ pushTag = group tripleo-core
+[receive]
+ requireChangeId = true
+ requireContributorAgreement = true
+[submit]
+ mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tuskar.config b/modules/openstack_project/files/gerrit/acls/openstack/tuskar.config
new file mode 100644
index 0000000000..6a4820ce44
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/tuskar.config
@@ -0,0 +1,12 @@
+[access "refs/heads/*"]
+ label-Code-Review = -2..+2 group tripleo-core
+ label-Approved = +0..+1 group tripleo-core
+ workInProgress = group tripleo-core
+[access "refs/tags/*"]
+ create = group tripleo-core
+ pushTag = group tripleo-core
+[receive]
+ requireChangeId = true
+ requireContributorAgreement = true
+[submit]
+ mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-tuskarclient.config b/modules/openstack_project/files/gerrit/acls/stackforge/python-tuskarclient.config
deleted file mode 100644
index ad3a1dbd3d..0000000000
--- a/modules/openstack_project/files/gerrit/acls/stackforge/python-tuskarclient.config
+++ /dev/null
@@ -1,12 +0,0 @@
-[access "refs/heads/*"]
- label-Code-Review = -2..+2 group tuskar-core
- label-Approved = +0..+1 group tuskar-core
- workInProgress = group tuskar-core
-[access "refs/tags/*"]
- create = group tuskar-core
- pushTag = group tuskar-core
-[receive]
- requireChangeId = true
- requireContributorAgreement = true
-[submit]
- mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tuskar-ui.config b/modules/openstack_project/files/gerrit/acls/stackforge/tuskar-ui.config
deleted file mode 100644
index ad3a1dbd3d..0000000000
--- a/modules/openstack_project/files/gerrit/acls/stackforge/tuskar-ui.config
+++ /dev/null
@@ -1,12 +0,0 @@
-[access "refs/heads/*"]
- label-Code-Review = -2..+2 group tuskar-core
- label-Approved = +0..+1 group tuskar-core
- workInProgress = group tuskar-core
-[access "refs/tags/*"]
- create = group tuskar-core
- pushTag = group tuskar-core
-[receive]
- requireChangeId = true
- requireContributorAgreement = true
-[submit]
- mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/tuskar.config b/modules/openstack_project/files/gerrit/acls/stackforge/tuskar.config
deleted file mode 100644
index ad3a1dbd3d..0000000000
--- a/modules/openstack_project/files/gerrit/acls/stackforge/tuskar.config
+++ /dev/null
@@ -1,12 +0,0 @@
-[access "refs/heads/*"]
- label-Code-Review = -2..+2 group tuskar-core
- label-Approved = +0..+1 group tuskar-core
- workInProgress = group tuskar-core
-[access "refs/tags/*"]
- create = group tuskar-core
- pushTag = group tuskar-core
-[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 8f601d2cde..1801cedc55 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1359,7 +1359,7 @@
- project:
name: python-tuskarclient
- github-org: stackforge
+ github-org: openstack
tarball-site: tarballs.openstack.org
node: precise
@@ -1379,7 +1379,7 @@
- project:
name: tuskar
- github-org: stackforge
+ github-org: openstack
tarball-site: tarballs.openstack.org
node: precise
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index c5b69c1e8c..c001584458 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3085,7 +3085,7 @@ projects:
- post-mirror-python27
- post-mirror-python33
- - name: stackforge/tuskar
+ - name: openstack/tuskar
check:
- gate-tuskar-pep8
- gate-tuskar-python26
@@ -3095,7 +3095,7 @@ projects:
- gate-tuskar-python26
- gate-tuskar-python27
- - name: stackforge/python-tuskarclient
+ - name: openstack/python-tuskarclient
check:
- gate-python-tuskarclient-pep8
- gate-python-tuskarclient-pylint
@@ -3109,7 +3109,7 @@ projects:
post:
- python-tuskarclient-coverage
- - name: stackforge/tuskar-ui
+ - name: openstack/tuskar-ui
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 3eb8c49734..48ff13cfc0 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -381,13 +381,13 @@
- project: stackforge/rally
description: OpenStack Benchmark System
upstream: git://github.com/pboris/rally.git
-- project: stackforge/tuskar
+- project: openstack/tuskar
description: "A service for managing OpenStack deployments"
upstream: git://github.com/tuskar/tuskar.git
-- project: stackforge/python-tuskarclient
+- project: openstack/python-tuskarclient
description: "Python bindings and CLI to Tuskar."
upstream: git://github.com/tuskar/python-tuskarclient.git
-- project: stackforge/tuskar-ui
+- project: openstack/tuskar-ui
description: "The UI component for Tuskar"
upstream: git://github.com/tuskar/tuskar-ui.git
- project: stackforge/pecan