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
This commit is contained in:
Clark Boylan
2025-08-19 09:19:18 -07:00
parent 7cd0c0425e
commit bd9a81ba68
5 changed files with 2 additions and 41 deletions

View File

@@ -2,9 +2,6 @@
# for gate jobs are put in the right groups for testing # for gate jobs are put in the right groups for testing
plugin: yamlgroup plugin: yamlgroup
groups: groups:
docker:
- bionic-docker
certcheck: certcheck:
- bridge[0-9]*.open*.org - bridge[0-9]*.open*.org
@@ -18,7 +15,6 @@ groups:
- borg-backup01.region.provider.opendev.org - borg-backup01.region.provider.opendev.org
borg-backup: borg-backup:
- borg-backup-bionic.opendev.org
- borg-backup-focal.opendev.org - borg-backup-focal.opendev.org
- borg-backup-jammy.opendev.org - borg-backup-jammy.opendev.org
- borg-backup-noble.opendev.org - borg-backup-noble.opendev.org

View File

@@ -44,11 +44,7 @@ def test_ntp(host):
service = host.service('systemd-timesyncd') service = host.service('systemd-timesyncd')
assert service.is_running assert service.is_running
# Focal updates the status string to just say NTP stdout_string = 'NTP service: active'
if host.system_info.codename == 'bionic':
stdout_string = 'systemd-timesyncd.service active'
else:
stdout_string = 'NTP service: active'
cmd = host.run("timedatectl status") cmd = host.run("timedatectl status")
assert stdout_string in cmd.stdout assert stdout_string in cmd.stdout

View File

@@ -16,7 +16,6 @@ import os.path
import pytest import pytest
testinfra_hosts = ['borg-backup01.region.provider.opendev.org', testinfra_hosts = ['borg-backup01.region.provider.opendev.org',
'borg-backup-bionic.opendev.org',
'borg-backup-focal.opendev.org', 'borg-backup-focal.opendev.org',
'borg-backup-jammy.opendev.org', 'borg-backup-jammy.opendev.org',
'borg-backup-noble.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': if hostname != 'borg-backup01.region.provider.opendev.org':
pytest.skip() pytest.skip()
for username in ('borg-borg-backup-bionic', for username in ('borg-borg-backup-focal',
'borg-borg-backup-focal',
'borg-borg-backup-jammy', 'borg-borg-backup-jammy',
'borg-borg-backup-noble'): 'borg-borg-backup-noble'):
homedir = os.path.join('/opt/backups/', username) homedir = os.path.join('/opt/backups/', username)

View File

@@ -27,18 +27,6 @@
# for build logs # for build logs
'/var/lib/dkms-make-logs': 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: - job:
name: system-config-zuul-role-integration-focal name: system-config-zuul-role-integration-focal
parent: system-config-zuul-role-integration parent: system-config-zuul-role-integration
@@ -188,7 +176,6 @@
name: system-config-zuul-role-integration name: system-config-zuul-role-integration
check: check:
jobs: jobs:
- system-config-zuul-role-integration-bionic
- system-config-zuul-role-integration-focal - system-config-zuul-role-integration-focal
- system-config-zuul-role-integration-focal-arm64 - system-config-zuul-role-integration-focal-arm64
- system-config-zuul-role-integration-jammy - system-config-zuul-role-integration-jammy
@@ -203,7 +190,6 @@
- system-config-zuul-role-integration-centos-9-stream-arm64 - system-config-zuul-role-integration-centos-9-stream-arm64
gate: gate:
jobs: jobs:
- system-config-zuul-role-integration-bionic
- system-config-zuul-role-integration-focal - system-config-zuul-role-integration-focal
- system-config-zuul-role-integration-focal-arm64 - system-config-zuul-role-integration-focal-arm64
- system-config-zuul-role-integration-jammy - system-config-zuul-role-integration-jammy

View File

@@ -58,13 +58,9 @@
description: | description: |
Run the "base" playbook on each of the node types Run the "base" playbook on each of the node types
currently in use. currently in use.
# Pinned for now due to Ansible 11 not supporting the Python on Bionic.
ansible-version: '9'
nodeset: nodeset:
nodes: nodes:
- &bridge_node_x86 { name: bridge99.opendev.org, label: ubuntu-jammy } - &bridge_node_x86 { name: bridge99.opendev.org, label: ubuntu-jammy }
- name: bionic
label: ubuntu-bionic
- name: focal - name: focal
label: ubuntu-focal label: ubuntu-focal
- name: jammy - name: jammy
@@ -98,13 +94,9 @@
parent: system-config-run-base parent: system-config-run-base
description: | description: |
Run the base playbook with the latest ansible. 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: nodeset:
nodes: nodes:
- <<: *bridge_node_x86 - <<: *bridge_node_x86
- name: bionic
label: ubuntu-bionic
- name: focal - name: focal
label: ubuntu-focal label: ubuntu-focal
- name: jammy - name: jammy
@@ -372,8 +364,6 @@
parent: system-config-run parent: system-config-run
description: | description: |
Run the playbook for borg backup configuration Run the playbook for borg backup configuration
# Pinned for now due to Ansible 11 not supporting the Python on Bionic.
ansible-version: '9'
nodeset: nodeset:
nodes: nodes:
- <<: *bridge_node_x86 - <<: *bridge_node_x86
@@ -381,8 +371,6 @@
label: ubuntu-focal label: ubuntu-focal
- name: borg-backup-focal.opendev.org - name: borg-backup-focal.opendev.org
label: ubuntu-focal label: ubuntu-focal
- name: borg-backup-bionic.opendev.org
label: ubuntu-bionic
- name: borg-backup-jammy.opendev.org - name: borg-backup-jammy.opendev.org
label: ubuntu-jammy label: ubuntu-jammy
- name: borg-backup-noble.opendev.org - name: borg-backup-noble.opendev.org
@@ -408,9 +396,6 @@
host_copy_output: host_copy_output:
'/var/log/prune-borg-backups.log': logs '/var/log/prune-borg-backups.log': logs
'/var/log/verify-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: borg-backup-focal.opendev.org:
host_copy_output: host_copy_output:
'/var/log/borg-backup-borg-backup01.region.provider.opendev.org.log': logs '/var/log/borg-backup-borg-backup01.region.provider.opendev.org.log': logs