diff --git a/gerrit/acls/opendev/puppet-accessbot.config b/gerrit/acls/opendev/puppet-accessbot.config deleted file mode 100644 index 21d055b04b..0000000000 --- a/gerrit/acls/opendev/puppet-accessbot.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-accessbot-core -label-Code-Review = -2..+2 group puppet-accessbot-core -label-Workflow = -1..+1 group puppet-accessbot-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-accessbot-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-ansible.config b/gerrit/acls/opendev/puppet-ansible.config deleted file mode 100644 index aee3608bb6..0000000000 --- a/gerrit/acls/opendev/puppet-ansible.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-ansible-core -label-Code-Review = -2..+2 group puppet-ansible-core -label-Workflow = -1..+1 group puppet-ansible-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-ansible-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-cgit.config b/gerrit/acls/opendev/puppet-cgit.config deleted file mode 100644 index b58483ee39..0000000000 --- a/gerrit/acls/opendev/puppet-cgit.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-cgit-core -label-Code-Review = -2..+2 group puppet-cgit-core -label-Workflow = -1..+1 group puppet-cgit-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-cgit-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-drupal.config b/gerrit/acls/opendev/puppet-drupal.config deleted file mode 100644 index 2a26dea4ab..0000000000 --- a/gerrit/acls/opendev/puppet-drupal.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-drupal-core -label-Code-Review = -2..+2 group puppet-drupal-core -label-Workflow = -1..+1 group puppet-drupal-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-drupal-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-etherpad_lite.config b/gerrit/acls/opendev/puppet-etherpad_lite.config deleted file mode 100644 index e1a448b53b..0000000000 --- a/gerrit/acls/opendev/puppet-etherpad_lite.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-etherpad_lite-core -label-Code-Review = -2..+2 group puppet-etherpad_lite-core -label-Workflow = -1..+1 group puppet-etherpad_lite-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-etherpad_lite-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-exim.config b/gerrit/acls/opendev/puppet-exim.config deleted file mode 100644 index f234d8f63d..0000000000 --- a/gerrit/acls/opendev/puppet-exim.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-exim-core -label-Code-Review = -2..+2 group puppet-exim-core -label-Workflow = -1..+1 group puppet-exim-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-exim-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-gerrit.config b/gerrit/acls/opendev/puppet-gerrit.config deleted file mode 100644 index 65e741d996..0000000000 --- a/gerrit/acls/opendev/puppet-gerrit.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-gerrit-core -label-Code-Review = -2..+2 group puppet-gerrit-core -label-Workflow = -1..+1 group puppet-gerrit-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-gerrit-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-gerritbot.config b/gerrit/acls/opendev/puppet-gerritbot.config deleted file mode 100644 index 399c424fe6..0000000000 --- a/gerrit/acls/opendev/puppet-gerritbot.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-gerritbot-core -label-Code-Review = -2..+2 group puppet-gerritbot-core -label-Workflow = -1..+1 group puppet-gerritbot-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-gerritbot-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-github.config b/gerrit/acls/opendev/puppet-github.config deleted file mode 100644 index 72b6905d61..0000000000 --- a/gerrit/acls/opendev/puppet-github.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-github-core -label-Code-Review = -2..+2 group puppet-github-core -label-Workflow = -1..+1 group puppet-github-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-github-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-infracloud.config b/gerrit/acls/opendev/puppet-infracloud.config deleted file mode 100644 index b40167b16a..0000000000 --- a/gerrit/acls/opendev/puppet-infracloud.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-infracloud-core -label-Code-Review = -2..+2 group puppet-infracloud-core -label-Workflow = -1..+1 group puppet-infracloud-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-infracloud-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-ipsilon.config b/gerrit/acls/opendev/puppet-ipsilon.config deleted file mode 100644 index aa4ca144a1..0000000000 --- a/gerrit/acls/opendev/puppet-ipsilon.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-ipsilon-core -label-Code-Review = -2..+2 group puppet-ipsilon-core -label-Workflow = -1..+1 group puppet-ipsilon-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-ipsilon-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-iptables.config b/gerrit/acls/opendev/puppet-iptables.config deleted file mode 100644 index ed716993cf..0000000000 --- a/gerrit/acls/opendev/puppet-iptables.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-iptables-core -label-Code-Review = -2..+2 group puppet-iptables-core -label-Workflow = -1..+1 group puppet-iptables-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-iptables-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-os_client_config.config b/gerrit/acls/opendev/puppet-os_client_config.config deleted file mode 100644 index dff5671259..0000000000 --- a/gerrit/acls/opendev/puppet-os_client_config.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-os_client_config-core -label-Code-Review = -2..+2 group puppet-os_client_config-core -label-Workflow = -1..+1 group puppet-os_client_config-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-os_client_config-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-packagekit.config b/gerrit/acls/opendev/puppet-packagekit.config deleted file mode 100644 index 9f0dc2d8b9..0000000000 --- a/gerrit/acls/opendev/puppet-packagekit.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-packagekit-core -label-Code-Review = -2..+2 group puppet-packagekit-core -label-Workflow = -1..+1 group puppet-packagekit-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-packagekit-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-phabricator.config b/gerrit/acls/opendev/puppet-phabricator.config deleted file mode 100644 index b3382275de..0000000000 --- a/gerrit/acls/opendev/puppet-phabricator.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-phabricator-core -label-Code-Review = -2..+2 group puppet-phabricator-core -label-Workflow = -1..+1 group puppet-phabricator-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-phabricator-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/opendev/puppet-snmpd.config b/gerrit/acls/opendev/puppet-snmpd.config deleted file mode 100644 index 30e0ed1912..0000000000 --- a/gerrit/acls/opendev/puppet-snmpd.config +++ /dev/null @@ -1,13 +0,0 @@ -[access "refs/heads/*"] -abandon = group puppet-snmpd-core -label-Code-Review = -2..+2 group puppet-snmpd-core -label-Workflow = -1..+1 group puppet-snmpd-core - -[access "refs/tags/*"] -pushSignedTag = group puppet-snmpd-release - -[receive] -requireChangeId = true - -[submit] -mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 85ab37933a..27445e119a 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -293,15 +293,11 @@ - openstack-ci description: OpenStack Infra Team conference presentations and papers - project: opendev/puppet-accessbot - use-storyboard: true - description: Puppet module for the accessbot - groups: - - openstack-ci + description: RETIRED, Puppet module for the accessbot + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-ansible - use-storyboard: true - description: Puppet module for Ansible - groups: - - openstack-ci + description: RETIRED, Puppet module for Ansible + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-apparmor use-storyboard: true groups: @@ -336,10 +332,8 @@ groups: - openstack-ci - project: opendev/puppet-cgit - use-storyboard: true - description: Puppet module to manage cgit - groups: - - openstack-ci + description: RETIRED, Puppet module to manage cgit + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-ciwatch use-storyboard: true description: Puppet module to manage CI Watch monitoring dashboard @@ -354,10 +348,8 @@ - openstack-ci description: Puppet module to install diskimage-builder and its depends - project: opendev/puppet-drupal - use-storyboard: true - description: Puppet module for groups drupal portal - groups: - - openstack-ci + description: RETIRED, Puppet module for groups drupal portal + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-elasticsearch use-storyboard: true description: Puppet module for elasticsearch @@ -374,15 +366,11 @@ groups: - openstack-ci - project: opendev/puppet-etherpad_lite - use-storyboard: true - description: Puppet module for Etherpad Lite - groups: - - openstack-ci + description: RETIRED, Puppet module for Etherpad Lite + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-exim - use-storyboard: true - description: Puppet module for Exim - groups: - - openstack-ci + description: RETIRED, Puppet module for Exim + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-featuretracker description: RETIRED, Puppet module to deploy featuretracker acl-config: /home/gerrit2/acls/openstack/retired.config @@ -392,20 +380,14 @@ groups: - openstack-ci - project: opendev/puppet-gerrit - use-storyboard: true - description: Puppet module for Gerrit - groups: - - openstack-ci + description: RETIRED, Puppet module for Gerrit + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-gerritbot - use-storyboard: true - description: Puppet module for GerritBot - groups: - - openstack-ci + description: RETIRED, Puppet module for GerritBot + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-github - use-storyboard: true - description: Puppet module to add github functionality - groups: - - openstack-ci + description: RETIRED, Puppet module to add github functionality + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-grafyaml use-storyboard: true description: Puppet module for Graphite @@ -437,20 +419,14 @@ groups: - openstack-ci - project: opendev/puppet-infracloud - use-storyboard: true - description: Puppet module for deploying the Infra Cloud - groups: - - openstack-ci + description: RETIRED, Puppet module for deploying the Infra Cloud + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-ipsilon - use-storyboard: true - description: Puppet module for Ipsilon - groups: - - openstack-ci + description: RETIRED, Puppet module for Ipsilon + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-iptables - use-storyboard: true - description: Puppet module for iptables - groups: - - openstack-ci + description: RETIRED, Puppet module for iptables + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-jeepyb use-storyboard: true description: Puppet module to manage jeepyb @@ -557,25 +533,19 @@ groups: - openstack-ci - project: opendev/puppet-os_client_config - use-storyboard: true - description: Puppet module for os-client-config - groups: - - openstack-ci + description: RETIRED, Puppet module for os-client-config + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-packagekit - use-storyboard: true - description: Puppet module for PackageKit - groups: - - openstack-ci + description: RETIRED, Puppet module for PackageKit + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-pgsql_backup use-storyboard: true description: Puppet module for postgresql backup groups: - openstack-ci - project: opendev/puppet-phabricator - use-storyboard: true - description: Puppet module for phabricator - groups: - - openstack-ci + description: RETIRED, Puppet module for phabricator + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-pip use-storyboard: true description: Puppet module to add pip functionality @@ -625,10 +595,8 @@ groups: - openstack-ci - project: opendev/puppet-snmpd - use-storyboard: true - description: Puppet module to manage snmpd - groups: - - openstack-ci + description: RETIRED, Puppet module to manage snmpd + acl-config: /home/gerrit2/acls/openstack/retired.config - project: opendev/puppet-ssh use-storyboard: true description: Puppet module to manage ssh diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index eb39b86e26..dad9c3bf05 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -108,37 +108,25 @@ opendev: - opendev/project-config - opendev/project-config-example - opendev/publications - - opendev/puppet-accessbot - - opendev/puppet-ansible - opendev/puppet-apparmor - opendev/puppet-askbot - opendev/puppet-asterisk - opendev/puppet-bandersnatch - opendev/puppet-bugdaystats - opendev/puppet-bup - - opendev/puppet-cgit - opendev/puppet-ciwatch - opendev/puppet-dashboard - opendev/puppet-diskimage_builder - - opendev/puppet-drupal - opendev/puppet-elastic_recheck - opendev/puppet-elasticsearch - opendev/puppet-ethercalc - - opendev/puppet-etherpad_lite - - opendev/puppet-exim - opendev/puppet-germqtt - - opendev/puppet-gerrit - - opendev/puppet-gerritbot - - opendev/puppet-github - opendev/puppet-grafyaml - opendev/puppet-graphite - opendev/puppet-haveged - opendev/puppet-hound - opendev/puppet-httpd - opendev/puppet-infra-cookiecutter - - opendev/puppet-infracloud - - opendev/puppet-ipsilon - - opendev/puppet-iptables - opendev/puppet-jeepyb - opendev/puppet-jenkins - opendev/puppet-kerberos @@ -160,10 +148,7 @@ opendev: - opendev/puppet-openstack_infra_spec_helper - opendev/puppet-openstackci - opendev/puppet-openstackid - - opendev/puppet-os_client_config - - opendev/puppet-packagekit - opendev/puppet-pgsql_backup - - opendev/puppet-phabricator - opendev/puppet-pip - opendev/puppet-planet - opendev/puppet-project_config @@ -173,7 +158,6 @@ opendev: - opendev/puppet-refstack - opendev/puppet-reviewday - opendev/puppet-simpleproxy - - opendev/puppet-snmpd - opendev/puppet-ssh - opendev/puppet-ssl_cert_check - opendev/puppet-statusbot diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index a577cacbb5..425444599c 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -344,16 +344,6 @@ - publish-infra-publications-index: branches: ^(?!master).*$ -- project: - name: opendev/puppet-accessbot - templates: - - noop-jobs - -- project: - name: opendev/puppet-ansible - templates: - - noop-jobs - - project: name: opendev/puppet-apparmor templates: @@ -420,11 +410,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-cgit - templates: - - noop-jobs - - project: name: opendev/puppet-ciwatch templates: @@ -447,11 +432,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-drupal - templates: - - noop-jobs - - project: name: opendev/puppet-elastic_recheck templates: @@ -485,16 +465,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-etherpad_lite - templates: - - noop-jobs - -- project: - name: opendev/puppet-exim - templates: - - noop-jobs - - project: name: opendev/puppet-germqtt templates: @@ -505,21 +475,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-gerrit - templates: - - noop-jobs - -- project: - name: opendev/puppet-gerritbot - templates: - - noop-jobs - -- project: - name: opendev/puppet-github - templates: - - noop-jobs - - project: name: opendev/puppet-grafyaml templates: @@ -584,21 +539,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-infracloud - templates: - - noop-jobs - -- project: - name: opendev/puppet-ipsilon - templates: - - noop-jobs - -- project: - name: opendev/puppet-iptables - templates: - - noop-jobs - - project: name: opendev/puppet-jeepyb templates: @@ -613,7 +553,13 @@ - project: name: opendev/puppet-jenkins templates: - - noop-jobs + - infra-puppet-check-jobs + - system-config-puppet-apply-jobs + - system-config-puppet-beaker-jobs + check: + queue: system-config + gate: + queue: system-config - project: name: opendev/puppet-kerberos @@ -757,7 +703,13 @@ - project: name: opendev/puppet-nodepool templates: - - noop-jobs + - infra-puppet-check-jobs + - system-config-puppet-apply-jobs + - system-config-puppet-beaker-jobs + check: + queue: system-config + gate: + queue: system-config - project: name: opendev/puppet-openafs @@ -796,7 +748,13 @@ - project: name: opendev/puppet-openstackci templates: - - noop-jobs + - infra-puppet-check-jobs + - system-config-puppet-apply-jobs + - system-config-puppet-beaker-jobs + check: + queue: system-config + gate: + queue: system-config - project: name: opendev/puppet-openstackid @@ -809,16 +767,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-os_client_config - templates: - - noop-jobs - -- project: - name: opendev/puppet-packagekit - templates: - - noop-jobs - - project: name: opendev/puppet-pgsql_backup templates: @@ -830,11 +778,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-phabricator - templates: - - noop-jobs - - project: name: opendev/puppet-pip templates: @@ -933,11 +876,6 @@ gate: queue: system-config -- project: - name: opendev/puppet-snmpd - templates: - - noop-jobs - - project: name: opendev/puppet-ssh templates: @@ -1093,7 +1031,13 @@ - project: name: opendev/puppet-zuul templates: - - noop-jobs + - infra-puppet-check-jobs + - system-config-puppet-apply-jobs + - system-config-puppet-beaker-jobs + check: + queue: system-config + gate: + queue: system-config - project: name: opendev/pynotedb diff --git a/zuul/main.yaml b/zuul/main.yaml index 0bb1299dd6..13707d1274 100644 --- a/zuul/main.yaml +++ b/zuul/main.yaml @@ -193,36 +193,24 @@ - opendev/netlify-sandbox - opendev/project-config-example - opendev/publications - - opendev/puppet-accessbot - - opendev/puppet-ansible - opendev/puppet-apparmor - opendev/puppet-askbot - opendev/puppet-asterisk - opendev/puppet-bandersnatch - opendev/puppet-bugdaystats - opendev/puppet-bup - - opendev/puppet-cgit - opendev/puppet-ciwatch - opendev/puppet-diskimage_builder - - opendev/puppet-drupal - opendev/puppet-elastic_recheck - opendev/puppet-elasticsearch - opendev/puppet-ethercalc - - opendev/puppet-etherpad_lite - - opendev/puppet-exim - opendev/puppet-germqtt - - opendev/puppet-gerrit - - opendev/puppet-gerritbot - - opendev/puppet-github - opendev/puppet-grafyaml - opendev/puppet-graphite - opendev/puppet-haveged - opendev/puppet-hound - opendev/puppet-httpd - opendev/puppet-infra-cookiecutter - - opendev/puppet-infracloud - - opendev/puppet-ipsilon - - opendev/puppet-iptables - opendev/puppet-jeepyb - opendev/puppet-jenkins - opendev/puppet-kerberos @@ -244,10 +232,7 @@ - opendev/puppet-openstack_infra_spec_helper - opendev/puppet-openstackci - opendev/puppet-openstackid - - opendev/puppet-os_client_config - - opendev/puppet-packagekit - opendev/puppet-pgsql_backup - - opendev/puppet-phabricator - opendev/puppet-pip - opendev/puppet-planet - opendev/puppet-project_config @@ -257,7 +242,6 @@ - opendev/puppet-refstack - opendev/puppet-reviewday - opendev/puppet-simpleproxy - - opendev/puppet-snmpd - opendev/puppet-ssh - opendev/puppet-ssl_cert_check - opendev/puppet-statusbot