From bd9a81ba68f0f50e97d7a1c34b5ebbb1801f0c7d Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 19 Aug 2025 09:19:18 -0700 Subject: [PATCH] Drop Bionic testing for OpenDev services, playbooks and roles A quick check of the Ansible fact cache on Bridge indicates that only hosts that are no longer in our inventory were Bionic nodes. Since we no longer have any Bionic nodes in production let's rip out the testing of our roles, playbooks and services on Bionic. In addition to being good for clarity this also allows us to switch all of the system-config jobs back to using the default ansible version for the opendev zuul tenants (11) which did not work with Bionic. Change-Id: I4e310adee198d6eedc19e499b05638eff2805a1e --- playbooks/zuul/templates/gate-groups.yaml.j2 | 4 ---- testinfra/test_base.py | 6 +----- testinfra/test_borg_backups.py | 4 +--- zuul.d/system-config-roles.yaml | 14 -------------- zuul.d/system-config-run.yaml | 15 --------------- 5 files changed, 2 insertions(+), 41 deletions(-) diff --git a/playbooks/zuul/templates/gate-groups.yaml.j2 b/playbooks/zuul/templates/gate-groups.yaml.j2 index 32fd7600bb..461fd0631b 100644 --- a/playbooks/zuul/templates/gate-groups.yaml.j2 +++ b/playbooks/zuul/templates/gate-groups.yaml.j2 @@ -2,9 +2,6 @@ # for gate jobs are put in the right groups for testing plugin: yamlgroup groups: - docker: - - bionic-docker - certcheck: - bridge[0-9]*.open*.org @@ -18,7 +15,6 @@ groups: - borg-backup01.region.provider.opendev.org borg-backup: - - borg-backup-bionic.opendev.org - borg-backup-focal.opendev.org - borg-backup-jammy.opendev.org - borg-backup-noble.opendev.org diff --git a/testinfra/test_base.py b/testinfra/test_base.py index 5a6eb8c6d1..bb20475665 100644 --- a/testinfra/test_base.py +++ b/testinfra/test_base.py @@ -44,11 +44,7 @@ def test_ntp(host): service = host.service('systemd-timesyncd') assert service.is_running - # Focal updates the status string to just say NTP - if host.system_info.codename == 'bionic': - stdout_string = 'systemd-timesyncd.service active' - else: - stdout_string = 'NTP service: active' + stdout_string = 'NTP service: active' cmd = host.run("timedatectl status") assert stdout_string in cmd.stdout diff --git a/testinfra/test_borg_backups.py b/testinfra/test_borg_backups.py index 12ae65a7ec..13466faaf1 100644 --- a/testinfra/test_borg_backups.py +++ b/testinfra/test_borg_backups.py @@ -16,7 +16,6 @@ import os.path import pytest testinfra_hosts = ['borg-backup01.region.provider.opendev.org', - 'borg-backup-bionic.opendev.org', 'borg-backup-focal.opendev.org', 'borg-backup-jammy.opendev.org', 'borg-backup-noble.opendev.org'] @@ -41,8 +40,7 @@ def test_borg_server_users(host): if hostname != 'borg-backup01.region.provider.opendev.org': pytest.skip() - for username in ('borg-borg-backup-bionic', - 'borg-borg-backup-focal', + for username in ('borg-borg-backup-focal', 'borg-borg-backup-jammy', 'borg-borg-backup-noble'): homedir = os.path.join('/opt/backups/', username) diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml index acb291682e..7a2306e14b 100644 --- a/zuul.d/system-config-roles.yaml +++ b/zuul.d/system-config-roles.yaml @@ -27,18 +27,6 @@ # for build logs '/var/lib/dkms-make-logs': logs -- job: - name: system-config-zuul-role-integration-bionic - parent: system-config-zuul-role-integration - nodeset: - nodes: - - name: base - label: ubuntu-bionic - groups: - - name: openafs - nodes: - - base - - job: name: system-config-zuul-role-integration-focal parent: system-config-zuul-role-integration @@ -188,7 +176,6 @@ name: system-config-zuul-role-integration check: jobs: - - system-config-zuul-role-integration-bionic - system-config-zuul-role-integration-focal - system-config-zuul-role-integration-focal-arm64 - system-config-zuul-role-integration-jammy @@ -203,7 +190,6 @@ - system-config-zuul-role-integration-centos-9-stream-arm64 gate: jobs: - - system-config-zuul-role-integration-bionic - system-config-zuul-role-integration-focal - system-config-zuul-role-integration-focal-arm64 - system-config-zuul-role-integration-jammy diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 466d8aebfb..2c9cb9d328 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -58,13 +58,9 @@ description: | Run the "base" playbook on each of the node types currently in use. - # Pinned for now due to Ansible 11 not supporting the Python on Bionic. - ansible-version: '9' nodeset: nodes: - &bridge_node_x86 { name: bridge99.opendev.org, label: ubuntu-jammy } - - name: bionic - label: ubuntu-bionic - name: focal label: ubuntu-focal - name: jammy @@ -98,13 +94,9 @@ parent: system-config-run-base description: | Run the base playbook with the latest ansible. - # Pinned for now due to Ansible 11 not supporting the Python on Bionic. - ansible-version: '9' nodeset: nodes: - <<: *bridge_node_x86 - - name: bionic - label: ubuntu-bionic - name: focal label: ubuntu-focal - name: jammy @@ -372,8 +364,6 @@ parent: system-config-run description: | Run the playbook for borg backup configuration - # Pinned for now due to Ansible 11 not supporting the Python on Bionic. - ansible-version: '9' nodeset: nodes: - <<: *bridge_node_x86 @@ -381,8 +371,6 @@ label: ubuntu-focal - name: borg-backup-focal.opendev.org label: ubuntu-focal - - name: borg-backup-bionic.opendev.org - label: ubuntu-bionic - name: borg-backup-jammy.opendev.org label: ubuntu-jammy - name: borg-backup-noble.opendev.org @@ -408,9 +396,6 @@ host_copy_output: '/var/log/prune-borg-backups.log': logs '/var/log/verify-borg-backups.log': logs - borg-backup-bionic.opendev.org: - host_copy_output: - '/var/log/borg-backup-borg-backup01.region.provider.opendev.org.log': logs borg-backup-focal.opendev.org: host_copy_output: '/var/log/borg-backup-borg-backup01.region.provider.opendev.org.log': logs