From ce60f9b8d6d606471c075f1f5c4389daec04eead Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 2 Oct 2013 22:02:37 +0400 Subject: [PATCH] Fix fuel repos layout * fuel-ostf-tests renamed to fuel-ostf * fuel-ostf-plugin is now obsolete * use common acl config file Change-Id: I351bf41b69a4e7818b309c0b154505cdd628804f --- .../files/gerrit/acls/stackforge/fuel-main.config | 12 ------------ .../gerrit/acls/stackforge/fuel-ostf-plugin.config | 12 ------------ .../gerrit/acls/stackforge/fuel-ostf-tests.config | 12 ------------ .../files/gerrit/acls/stackforge/fuel-web.config | 12 ------------ .../stackforge/{fuel-astute.config => fuel.config} | 0 modules/openstack_project/files/zuul/layout.yaml | 2 +- .../templates/review.projects.yaml.erb | 9 +++++++-- 7 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/fuel-main.config delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-plugin.config delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-tests.config delete mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/fuel-web.config rename modules/openstack_project/files/gerrit/acls/stackforge/{fuel-astute.config => fuel.config} (100%) diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-main.config b/modules/openstack_project/files/gerrit/acls/stackforge/fuel-main.config deleted file mode 100644 index 64710b83ef..0000000000 --- a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-main.config +++ /dev/null @@ -1,12 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group fuel-core - label-Approved = +0..+1 group fuel-core - workInProgress = group fuel-core -[access "refs/tags/*"] - create = group fuel-core - pushTag = group fuel-core -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-plugin.config b/modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-plugin.config deleted file mode 100644 index 64710b83ef..0000000000 --- a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-plugin.config +++ /dev/null @@ -1,12 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group fuel-core - label-Approved = +0..+1 group fuel-core - workInProgress = group fuel-core -[access "refs/tags/*"] - create = group fuel-core - pushTag = group fuel-core -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-tests.config b/modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-tests.config deleted file mode 100644 index 64710b83ef..0000000000 --- a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-tests.config +++ /dev/null @@ -1,12 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group fuel-core - label-Approved = +0..+1 group fuel-core - workInProgress = group fuel-core -[access "refs/tags/*"] - create = group fuel-core - pushTag = group fuel-core -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-web.config b/modules/openstack_project/files/gerrit/acls/stackforge/fuel-web.config deleted file mode 100644 index 64710b83ef..0000000000 --- a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-web.config +++ /dev/null @@ -1,12 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group fuel-core - label-Approved = +0..+1 group fuel-core - workInProgress = group fuel-core -[access "refs/tags/*"] - create = group fuel-core - pushTag = group fuel-core -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/fuel-astute.config b/modules/openstack_project/files/gerrit/acls/stackforge/fuel.config similarity index 100% rename from modules/openstack_project/files/gerrit/acls/stackforge/fuel-astute.config rename to modules/openstack_project/files/gerrit/acls/stackforge/fuel.config diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 837e691631..8b3a420fea 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -3207,7 +3207,7 @@ projects: gate: - gate-noop - - name: stackforge/fuel-ostf-tests + - name: stackforge/fuel-ostf 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..ee5899d6ef 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -407,16 +407,21 @@ - project: stackforge/fuel-main description: "Fuel is the control plane for installing and managing OpenStack. It is capable of doing bare metal provisioning of physical nodes, installing OpenStack on them, and much more." upstream: git://github.com/Mirantis/fuel-main.git + acl-config: /home/gerrit2/acls/stackforge/fuel.config - project: stackforge/fuel-web description: Fuel UI upstream: git://github.com/Mirantis/fuelweb.git + acl-config: /home/gerrit2/acls/stackforge/fuel.config - project: stackforge/fuel-astute description: Fuel orchestrator upstream: git://github.com/Mirantis/astute.git -- project: stackforge/fuel-ostf-tests + acl-config: /home/gerrit2/acls/stackforge/fuel.config +- project: stackforge/fuel-ostf upstream: git://github.com/Mirantis/fuel-ostf-tests.git + acl-config: /home/gerrit2/acls/stackforge/fuel.config - project: stackforge/fuel-ostf-plugin - upstream: git://github.com/Mirantis/fuel-ostf-plugin.git + description: "Obsolete repo, please, take a look at fuel-ostf" + acl-config: /home/gerrit2/acls/stackforge/fuel.config - project: stackforge/manila description: "Shared filesystem management project for OpenStack." upstream: git://github.com/bswartz/manila.git