diff --git a/gerrit/acls/openstack/neutron-lbaas-dashboard.config b/gerrit/acls/openstack/neutron-lbaas-dashboard.config deleted file mode 100644 index f6a083bd32..0000000000 --- a/gerrit/acls/openstack/neutron-lbaas-dashboard.config +++ /dev/null @@ -1,33 +0,0 @@ -[access] -inheritFrom = openstack/meta-config - -[access "refs/for/refs/*"] -pushMerge = group octavia-release - -[access "refs/heads/*"] -abandon = group neutron-lbaas-dashboard-core -label-Code-Review = -2..+2 group neutron-lbaas-dashboard-core -label-Verified = -1..+1 group octavia-ci -label-Workflow = -1..+1 group neutron-lbaas-dashboard-core - -[access "refs/heads/stable/*"] -abandon = group Change Owner -abandon = group Project Bootstrappers -abandon = group octavia-stable-maint -abandon = group stable-maint-core -exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers -label-Code-Review = -2..+2 group octavia-stable-maint -label-Code-Review = -2..+2 group stable-maint-core -label-Code-Review = -1..+1 group Registered Users -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group octavia-stable-maint -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/neutron-lbaas.config b/gerrit/acls/openstack/neutron-lbaas.config deleted file mode 100644 index 38c8f6dfc0..0000000000 --- a/gerrit/acls/openstack/neutron-lbaas.config +++ /dev/null @@ -1,33 +0,0 @@ -[access] -inheritFrom = openstack/meta-config - -[access "refs/for/refs/*"] -pushMerge = group octavia-release - -[access "refs/heads/*"] -abandon = group neutron-lbaas-core -label-Code-Review = -2..+2 group neutron-lbaas-core -label-Verified = -1..+1 group octavia-ci -label-Workflow = -1..+1 group neutron-lbaas-core - -[access "refs/heads/stable/*"] -abandon = group Change Owner -abandon = group Project Bootstrappers -abandon = group octavia-stable-maint -abandon = group stable-maint-core -exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers -label-Code-Review = -2..+2 group octavia-stable-maint -label-Code-Review = -2..+2 group stable-maint-core -label-Code-Review = -1..+1 group Registered Users -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group octavia-stable-maint -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 846a86f110..30b674ffde 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -3804,21 +3804,11 @@ description: RETIRED, Neutron-Neutron Interconnection service acl-config: /home/gerrit2/acls/openstack/retired.config - project: openstack/neutron-lbaas - description: Load balancing services for OpenStack Neutron. - options: - - translate - docimpact-group: octavia - groups: - - octavia - use-storyboard: true + description: RETIRED, Load balancing services for OpenStack Neutron. + acl-config: /home/gerrit2/acls/openstack/retired.config - project: openstack/neutron-lbaas-dashboard - description: Horizon UI support for Neutron LBaaS - docimpact-group: octavia - options: - - translate - groups: - - octavia - use-storyboard: true + description: RETIRED, Horizon UI support for Neutron LBaaS + acl-config: /home/gerrit2/acls/openstack/retired.config - project: openstack/neutron-lib description: Neutron shared routines and utilities. options: diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 0d629c8642..fa0f7e4559 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -793,8 +793,6 @@ openstack-lbaas: - patchset-created - change-merged projects: - - openstack/neutron-lbaas - - openstack/neutron-lbaas-dashboard - openstack/octavia - openstack/octavia-dashboard - openstack/octavia-lib @@ -1292,8 +1290,6 @@ openstack-stable: - openstack/neutron - openstack/neutron-dynamic-routing - openstack/neutron-fwaas - - openstack/neutron-lbaas - - openstack/neutron-lbaas-dashboard - openstack/neutron-lib - openstack/neutron-vpnaas - openstack/nova diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 7333499269..696bb3a4e3 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -3351,32 +3351,6 @@ - official-openstack-repo-jobs - publish-to-pypi -- project: - name: openstack/neutron-lbaas - templates: - - official-openstack-repo-jobs - check: - jobs: - - noop: - branches: master - gate: - jobs: - - noop: - branches: master - -- project: - name: openstack/neutron-lbaas-dashboard - templates: - - official-openstack-repo-jobs - check: - jobs: - - noop: - branches: master - gate: - jobs: - - noop: - branches: master - - project: name: openstack/neutron-lib templates: diff --git a/zuul/main.yaml b/zuul/main.yaml index 088d553d7f..d5fd634c46 100644 --- a/zuul/main.yaml +++ b/zuul/main.yaml @@ -603,8 +603,6 @@ - openstack/neutron-dynamic-routing - openstack/neutron-fwaas - openstack/neutron-fwaas-dashboard - - openstack/neutron-lbaas - - openstack/neutron-lbaas-dashboard - openstack/neutron-lib - openstack/neutron-specs - openstack/neutron-tempest-plugin