From 60050bea903dcf85898189482f90b9a1f2555719 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Wed, 21 Nov 2012 11:48:58 +1100 Subject: [PATCH] Move heat and heatclient to openstack/ and change group from heat to heat-core So move heat to github.com/openstack - yea! (also python-heatclient) Also use the "heat-core" and "heat-drivers" teams correctly. (we only had a "heat" team before). Change-Id: I8b145bf8ddb51ed23811187538c96d6832fa9e52 Signed-off-by: Angus Salkeld Reviewed-on: https://review.openstack.org/16593 Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- .../gerritbot/files/gerritbot_channel_config.yaml | 4 ++-- .../files/gerrit/acls/heat-api/heat.config | 11 ----------- .../gerrit/acls/heat-api/python-heatclient.config | 11 ----------- .../files/gerrit/acls/openstack/heat.config | 13 +++++++++++++ .../gerrit/acls/openstack/python-heatclient.config | 13 +++++++++++++ .../files/jenkins_job_builder/config/projects.yaml | 4 ++-- modules/openstack_project/files/zuul/layout.yaml | 4 ++-- .../templates/review.projects.yaml.erb | 11 ++++------- 8 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 modules/openstack_project/files/gerrit/acls/heat-api/heat.config delete mode 100644 modules/openstack_project/files/gerrit/acls/heat-api/python-heatclient.config create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/heat.config create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index a8e817b871..ab08d277cc 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -108,7 +108,7 @@ heat: - change-merged - x-vrif-minus-2 projects: - - heat-api/heat - - heat-api/python-heatclient + - openstack/heat + - openstack/python-heatclient branches: - master diff --git a/modules/openstack_project/files/gerrit/acls/heat-api/heat.config b/modules/openstack_project/files/gerrit/acls/heat-api/heat.config deleted file mode 100644 index c7b11f35d7..0000000000 --- a/modules/openstack_project/files/gerrit/acls/heat-api/heat.config +++ /dev/null @@ -1,11 +0,0 @@ -[access "refs/*"] - owner = group Administrators - create = group heat - pushTag = group heat -[access "refs/heads/*"] - label-Approved = +0..+1 group heat - label-Code-Review = -2..+2 group heat -[project] - state = active -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/heat-api/python-heatclient.config b/modules/openstack_project/files/gerrit/acls/heat-api/python-heatclient.config deleted file mode 100644 index c7b11f35d7..0000000000 --- a/modules/openstack_project/files/gerrit/acls/heat-api/python-heatclient.config +++ /dev/null @@ -1,11 +0,0 @@ -[access "refs/*"] - owner = group Administrators - create = group heat - pushTag = group heat -[access "refs/heads/*"] - label-Approved = +0..+1 group heat - label-Code-Review = -2..+2 group heat -[project] - state = active -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/heat.config b/modules/openstack_project/files/gerrit/acls/openstack/heat.config new file mode 100644 index 0000000000..1457650aaf --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack/heat.config @@ -0,0 +1,13 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group heat-core + label-Approved = +0..+1 group heat-core +[access "refs/heads/milestone-proposed"] + label-Code-Review = -2..+2 group heat-drivers + label-Approved = +0..+1 group heat-drivers +[project] + state = active +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config new file mode 100644 index 0000000000..1457650aaf --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-heatclient.config @@ -0,0 +1,13 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group heat-core + label-Approved = +0..+1 group heat-core +[access "refs/heads/milestone-proposed"] + label-Code-Review = -2..+2 group heat-drivers + label-Approved = +0..+1 group heat-drivers +[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 7ba9a1b5c1..0c5da57cb8 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -161,7 +161,7 @@ - project: name: heat - github-org: heat-api + github-org: openstack node: oneiric jobs: @@ -170,7 +170,7 @@ - project: name: python-heatclient - github-org: heat-api + github-org: openstack node: precise jobs: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index ca6c642b3b..5a6794ad7d 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -688,7 +688,7 @@ projects: - gate-libra-pep8 - gate-libra-python27 - - name: heat-api/heat + - name: openstack/heat check: - gate-heat-merge: - gate-heat-pep8 @@ -701,7 +701,7 @@ projects: - gate-heat-python26 - gate-heat-python27 - - name: heat-api/python-heatclient + - name: openstack/python-heatclient check: - gate-python-heatclient-merge: - gate-python-heatclient-pep8 diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index 1f381d1077..d83d3d54f2 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -9,13 +9,10 @@ has-pull-requests: False has-downloads: False --- -- project: heat-api/heat - options: - - has-wiki - description: '"Heat" keeps the clouds up ;)' - acl_config: /home/gerrit2/acls/heat-api/heat.config -- project: heat-api/python-heatclient - acl_config: /home/gerrit2/acls/heat-api/python-heatclient.config +- project: openstack/heat + acl_config: /home/gerrit2/acls/openstack/heat.config +- project: openstack/python-heatclient + acl_config: /home/gerrit2/acls/openstack/python-heatclient.config - project: openstack-ci/devstack-gate acl_config: /home/gerrit2/acls/openstack-ci/devstack-gate.config - project: openstack-ci/gerrit