diff --git a/gerrit/acls/opendev/puppet-openstackid.config b/gerrit/acls/opendev/puppet-openstackid.config deleted file mode 100644 index 260c34ea36..0000000000 --- a/gerrit/acls/opendev/puppet-openstackid.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-openstackid-core -label-Code-Review = -2..+2 group puppet-openstackid-core -label-Workflow = -1..+1 group puppet-openstackid-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-openstackid-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openinfra/openstackid-resources.config b/gerrit/acls/openinfra/openstackid-resources.config deleted file mode 100644 index b028ae2dc0..0000000000 --- a/gerrit/acls/openinfra/openstackid-resources.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group openstackid-resources-core -label-Code-Review = -2..+2 group openstackid-resources-core -label-Workflow = -1..+1 group openstackid-resources-core - -[access "refs/tags/*"] -pushSignedTag = group openstackid-resources-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openinfra/openstackid.config b/gerrit/acls/openinfra/openstackid.config deleted file mode 100644 index 3d056d0773..0000000000 --- a/gerrit/acls/openinfra/openstackid.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group openstackid-core -label-Code-Review = -2..+2 group openstackid-core -label-Workflow = -1..+1 group openstackid-core - -[access "refs/tags/*"] -pushSignedTag = group openstackid-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 085f9f5a51..978ff9f025 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -542,9 +542,10 @@ - openstack-ci - project: opendev/puppet-openstackid use-storyboard: true - description: Puppet module to deploy openstackid + description: RETIRED, Puppet module to deploy openstackid groups: - openstack-ci + acl-config: /home/gerrit2/acls/opendev/retired.config - project: opendev/puppet-openstack_health use-storyboard: true description: Puppet module to deploy OpenStack Health @@ -807,14 +808,16 @@ of the www.openstack.org website. - project: openinfra/openstackid use-storyboard: true - description: Authentication system for the OpenStack Foundation site + description: RETIRED, Authentication system for the OpenStack Foundation site groups: - openstack-org + acl-config: /home/gerrit2/acls/opendev/retired.config - project: openinfra/openstackid-resources use-storyboard: true - description: Resource service for the OpenStack Foundation site + description: RETIRED, Resource service for the OpenStack Foundation site groups: - openstack-org + acl-config: /home/gerrit2/acls/opendev/retired.config - project: openinfra/openstackweb use-storyboard: true description: OpenStack Foundation web site software diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 1301dae3b0..fee19a94cb 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -134,7 +134,6 @@ opendev: - opendev/puppet-openstack_health - opendev/puppet-openstack_infra_spec_helper - opendev/puppet-openstackci - - opendev/puppet-openstackid - opendev/puppet-pgsql_backup - opendev/puppet-pip - opendev/puppet-planet diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 5846c3699c..d77b4f194d 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -686,11 +686,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-openstackid - templates: - - noop-jobs - - project: name: opendev/puppet-pgsql_backup templates: @@ -1081,16 +1076,6 @@ templates: - noop-jobs -- project: - name: openinfra/openstackid - templates: - - noop-jobs - -- project: - name: openinfra/openstackid-resources - templates: - - noop-jobs - - project: name: openinfra/openstackweb templates: diff --git a/zuul/main.yaml b/zuul/main.yaml index 6cb16e1733..a167067910 100644 --- a/zuul/main.yaml +++ b/zuul/main.yaml @@ -200,7 +200,6 @@ - opendev/puppet-openstack_health - opendev/puppet-openstack_infra_spec_helper - opendev/puppet-openstackci - - opendev/puppet-openstackid - opendev/puppet-pgsql_backup - opendev/puppet-pip - opendev/puppet-planet @@ -246,8 +245,6 @@ - openinfra/interop - openinfra/odsreg - openinfra/openstack-map - - openinfra/openstackid - - openinfra/openstackid-resources - openinfra/openstackweb - openinfra/python-tempestconf - openinfra/refstack