From 4b4f5443a0a7724bbe5e10e36676ff4d2f6ea4ae Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 5 Dec 2022 22:42:50 +0000 Subject: [PATCH] Remove opendev and zuul sites from old mm2 server Take the site configuration for lists.opendev.org and lists.zuul-ci.org off of the old lists.openstack.org server, and also clean up tests of the same. Change-Id: Ic6095889c29d8a34def113204052300558f0a77c --- .../host_vars/lists.openstack.org.yaml | 72 +------------------ testinfra/test_lists_o_o.py | 36 ++-------- 2 files changed, 6 insertions(+), 102 deletions(-) diff --git a/inventory/service/host_vars/lists.openstack.org.yaml b/inventory/service/host_vars/lists.openstack.org.yaml index dd7c89f8e0..49c27b29fd 100644 --- a/inventory/service/host_vars/lists.openstack.org.yaml +++ b/inventory/service/host_vars/lists.openstack.org.yaml @@ -1,4 +1,4 @@ -mm_domains: 'lists.openstack.org:lists.zuul-ci.org:lists.airshipit.org:lists.starlingx.io:lists.opendev.org:lists.openinfra.dev' +mm_domains: 'lists.openstack.org:lists.airshipit.org:lists.starlingx.io:lists.openinfra.dev' exim_local_domains: "@:{{ mm_domains }}" exim_enable_spf: true exim_aliases: @@ -113,10 +113,8 @@ letsencrypt_certs: lists-openstack-org-main: - lists.openstack.org - lists.airshipit.org - - lists.opendev.org - lists.openinfra.dev - lists.starlingx.io - - lists.zuul-ci.org mailman_multihost: true mailman_sites: - name: airship @@ -147,54 +145,6 @@ mailman_sites: description: 'Embargoed security vulnerability announcements for Airship consumers.' admin: 'andrew.walters@att.com' password: "{{ mailman_list_password }}" - - name: opendev - listdomain: lists.opendev.org - install_languages: ['en'] - lists: - - name: mailman - description: 'The mailman site list' - admin: 'nobody@openstack.org' - password: "{{ mailman_list_password }}" - - name: edge-computing - description: 'Organizing efforts around the edge-computing focus area.' - admin: 'ildiko@openinfra.dev' - password: "{{ mailman_list_password }}" - - name: rust-vmm - description: 'Collaborating on Rust-based virtual machine monitors.' - admin: 'claire@openstack.org' - password: "{{ mailman_list_password }}" - - name: rustyk8s - description: 'Collaborating on Rust-based Kubernetes API.' - admin: 'allison@lohutok.net' - password: "{{ mailman_list_password }}" - - name: nbmp-discuss - description: 'Collaborating on Network Based Media Processing related platform and infrastructure systems usage and development.' - admin: 'ildiko@openstack.org' - password: "{{ mailman_list_password }}" - - name: service-announce - description: 'Announcement list for OpenDev services.' - admin: 'cboylan@sapwetik.org' - password: "{{ mailman_list_password }}" - - name: service-discuss - description: 'Discussion list for OpenDev services.' - admin: 'cboylan@sapwetik.org' - password: "{{ mailman_list_password }}" - - name: service-incident - description: 'Private list for OpenDev incident coordination.' - admin: 'cboylan@sapwetik.org' - password: "{{ mailman_list_password }}" - - name: openinfralabs - description: 'Discussion of the OpenInfra Labs academic and research resource sharing effort' - admin: 'mnaser@vexxhost.com' - password: "{{ mailman_list_password }}" - - name: floss-mooc - description: 'Discussions & Coordination around the FLOSS MOOC being collaboratively developed here: https://gitlab.com/mooc-floss/mooc-floss' - admin: 'knelson@openinfra.dev' - password: "{{ mailman_list_password }}" - - name: computing-force-network - description: 'Organizing efforts around Computing Force Network related area' - admin: 'niujie@outlook.com' - password: "{{ mailman_list_password }}" - name: openinfra listdomain: lists.openinfra.dev install_languages: ['en'] @@ -307,23 +257,3 @@ mailman_sites: description: 'Discussion of StarlingX usage and development.' admin: 'jonathan@openstack.org' password: "{{ mailman_list_password }}" - - name: zuul - listdomain: lists.zuul-ci.org - install_languages: ['en'] - lists: - - name: mailman - description: 'The mailman site list' - admin: 'nobody@openstack.org' - password: "{{ mailman_list_password }}" - - name: zuul-announce - description: 'Announcements of Zuul releases and other important information.' - admin: 'corvus@inaugust.com' - password: "{{ mailman_list_password }}" - - name: zuul-discuss - description: 'Discussion of Zuul usage and development.' - admin: 'corvus@inaugust.com' - password: "{{ mailman_list_password }}" - - name: zuul-jobs-failures - description: 'Gets notifications about zuul-jobs periodic job failures.' - admin: 'ssbarnea@redhat.com' - password: "{{ mailman_list_password }}" diff --git a/testinfra/test_lists_o_o.py b/testinfra/test_lists_o_o.py index 8a60e2b5d1..51ff453e6b 100644 --- a/testinfra/test_lists_o_o.py +++ b/testinfra/test_lists_o_o.py @@ -16,9 +16,6 @@ def test_mm_list_is_present(host): cmd = host.run('HOST=lists.airshipit.org list_lists --bare') assert 'airship-discuss' in cmd.stdout - cmd = host.run('HOST=lists.opendev.org list_lists --bare') - assert 'service-discuss' in cmd.stdout - cmd = host.run('HOST=lists.openinfra.dev list_lists --bare') assert 'staff' in cmd.stdout @@ -28,18 +25,11 @@ def test_mm_list_is_present(host): cmd = host.run('HOST=lists.starlingx.io list_lists --bare') assert 'starlingx-discuss' in cmd.stdout - cmd = host.run('HOST=lists.zuul-ci.org list_lists --bare') - assert 'zuul-discuss' in cmd.stdout - def test_mm_list_site(host): cmd = host.run('curl --insecure ' '--resolve lists.airshipit.org:443:127.0.0.1 ' 'https://lists.airshipit.org/cgi-bin/mailman/listinfo') assert 'lists.airshipit.org Mailing Lists' in cmd.stdout - cmd = host.run('curl --insecure ' - '--resolve lists.opendev.org:443:127.0.0.1 ' - 'https://lists.opendev.org/cgi-bin/mailman/listinfo') - assert 'lists.opendev.org Mailing Lists' in cmd.stdout cmd = host.run('curl --insecure ' '--resolve lists.openinfra.dev:443:127.0.0.1 ' 'https://lists.openinfra.dev/cgi-bin/mailman/listinfo') @@ -52,10 +42,6 @@ def test_mm_list_site(host): '--resolve lists.starlingx.io:443:127.0.0.1 ' 'https://lists.starlingx.io/cgi-bin/mailman/listinfo') assert 'lists.starlingx.io Mailing Lists' in cmd.stdout - cmd = host.run('curl --insecure ' - '--resolve lists.zuul-ci.org:443:127.0.0.1 ' - 'https://lists.zuul-ci.org/cgi-bin/mailman/listinfo') - assert 'lists.zuul-ci.org Mailing Lists' in cmd.stdout def test_mm_list_site_redirect_http(host): cmd = host.run('curl ' @@ -64,12 +50,6 @@ def test_mm_list_site_redirect_http(host): assert ('The document has moved here') in cmd.stdout - cmd = host.run('curl ' - '--resolve lists.opendev.org:80:127.0.0.1 ' - 'http://lists.opendev.org/cgi-bin/mailman/listinfo') - assert ('The document has moved here') in cmd.stdout cmd = host.run('curl ' '--resolve lists.openinfra.dev:80:127.0.0.1 ' 'http://lists.openinfra.dev/cgi-bin/mailman/listinfo') @@ -88,12 +68,6 @@ def test_mm_list_site_redirect_http(host): assert ('The document has moved here') in cmd.stdout - cmd = host.run('curl ' - '--resolve lists.zuul-ci.org:80:127.0.0.1 ' - 'http://lists.zuul-ci.org/cgi-bin/mailman/listinfo') - assert ('The document has moved here') in cmd.stdout def test_mm_list_site_redirect_listinfo(host): cmd = host.run('curl --insecure ' @@ -123,12 +97,12 @@ def test_mm_list_site_redirect_archives(host): def test_mm_list_site_static_files(host): cmd = host.run('curl --insecure ' - '--resolve lists.opendev.org:443:127.0.0.1 ' - 'https://lists.opendev.org/archives.yaml') - assert 'service-discuss' in cmd.stdout + '--resolve lists.openstack.org:443:127.0.0.1 ' + 'https://lists.openstack.org/archives.yaml') + assert 'openstack-discuss' in cmd.stdout cmd = host.run('curl --insecure ' - '--resolve lists.opendev.org:443:127.0.0.1 ' - 'https://lists.opendev.org/robots.txt') + '--resolve lists.openstack.org:443:127.0.0.1 ' + 'https://lists.openstack.org/robots.txt') assert 'Disallow: /' in cmd.stdout def test_domain_aliases(host):