From 3f10b06710f932cbac48ddffdc3ea4b322431ea3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 18 Aug 2025 14:53:21 -0700 Subject: [PATCH] Fix system-config-run for Ansible 9 vs 11 Ansible 11 dropped support for the python version on Ubuntu bionic. Some of our test jobs continue to test against bionic nodes to cover functioanlity there. Pin these jobs back to Ansible 9 so that Ansible can speak to these test nodes We also drop the bionic and focal image types from the mirror job entirely because we no longer have any bionic or focal image nodes acting as mirrors. Change-Id: I12718599f7e252f45a625e96a0dbbbce9768d008 --- .../letsencrypt-create-certs/handlers/main.yaml | 6 ------ playbooks/zuul/run-base.yaml | 2 -- playbooks/zuul/templates/gate-groups.yaml.j2 | 2 -- ...irror03.openafs.provider.opendev.org.yaml.j2 | 4 ---- ...irror04.openafs.provider.opendev.org.yaml.j2 | 4 ---- testinfra/test_mirror.py | 4 +--- zuul.d/system-config-run.yaml | 17 +++++++---------- 7 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 playbooks/zuul/templates/host_vars/mirror03.openafs.provider.opendev.org.yaml.j2 delete mode 100644 playbooks/zuul/templates/host_vars/mirror04.openafs.provider.opendev.org.yaml.j2 diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index 8604ccbd20..07a829e39d 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -227,12 +227,6 @@ - name: letsencrypt updated mirror02-openafs-provider-opendev-org-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml -- name: letsencrypt updated mirror03-openafs-provider-opendev-org-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - -- name: letsencrypt updated mirror04-openafs-provider-opendev-org-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - - name: letsencrypt updated gitea99-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml index f3962a45e0..4f13534f03 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -148,8 +148,6 @@ - host_vars/gitea99.opendev.org.yaml - host_vars/mirror01.openafs.provider.opendev.org.yaml - host_vars/mirror02.openafs.provider.opendev.org.yaml - - host_vars/mirror03.openafs.provider.opendev.org.yaml - - host_vars/mirror04.openafs.provider.opendev.org.yaml - host_vars/mirror-update99.opendev.org.yaml - host_vars/paste99.opendev.org.yaml - host_vars/review99.opendev.org.yaml diff --git a/playbooks/zuul/templates/gate-groups.yaml.j2 b/playbooks/zuul/templates/gate-groups.yaml.j2 index a9193d7aba..32fd7600bb 100644 --- a/playbooks/zuul/templates/gate-groups.yaml.j2 +++ b/playbooks/zuul/templates/gate-groups.yaml.j2 @@ -13,8 +13,6 @@ groups: - letsencrypt02.opendev.org - mirror01.openafs.provider.opendev.org - mirror02.openafs.provider.opendev.org - - mirror03.openafs.provider.opendev.org - - mirror04.openafs.provider.opendev.org borg-backup-server: - borg-backup01.region.provider.opendev.org diff --git a/playbooks/zuul/templates/host_vars/mirror03.openafs.provider.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/mirror03.openafs.provider.opendev.org.yaml.j2 deleted file mode 100644 index b0cd2da5af..0000000000 --- a/playbooks/zuul/templates/host_vars/mirror03.openafs.provider.opendev.org.yaml.j2 +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - mirror03-openafs-provider-opendev-org-main: - - mirror03.openafs.provider.opendev.org - - mirror.openafs.provider.opendev.org diff --git a/playbooks/zuul/templates/host_vars/mirror04.openafs.provider.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/mirror04.openafs.provider.opendev.org.yaml.j2 deleted file mode 100644 index e13fa19bb1..0000000000 --- a/playbooks/zuul/templates/host_vars/mirror04.openafs.provider.opendev.org.yaml.j2 +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - mirror04-openafs-provider-opendev-org-main: - - mirror04.openafs.provider.opendev.org - - mirror.openafs.provider.opendev.org diff --git a/testinfra/test_mirror.py b/testinfra/test_mirror.py index e44b3e28a2..68273cd04c 100644 --- a/testinfra/test_mirror.py +++ b/testinfra/test_mirror.py @@ -17,9 +17,7 @@ import json testinfra_hosts = ['mirror01.openafs.provider.opendev.org', - 'mirror02.openafs.provider.opendev.org', - 'mirror03.openafs.provider.opendev.org', - 'mirror04.openafs.provider.opendev.org'] + 'mirror02.openafs.provider.opendev.org',] def test_apache(host): apache = host.service('apache2') diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 3c86fae8cc..466d8aebfb 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -58,6 +58,8 @@ 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 } @@ -96,6 +98,8 @@ 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 @@ -368,6 +372,8 @@ 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 @@ -436,11 +442,6 @@ '/var/log/apache2/': logs '/var/log/acme.sh': logs '/etc/apache2/sites-available/mirror.conf': logs - mirror03.openafs.provider.opendev.org: - host_copy_output: - '/var/log/apache2/': logs - '/var/log/acme.sh': logs - '/etc/apache2/sites-available/mirror.conf': logs files: - playbooks/bootstrap-bridge.yaml - roles/ @@ -460,12 +461,8 @@ nodes: - <<: *bridge_node_x86 - name: mirror01.openafs.provider.opendev.org - label: ubuntu-bionic - - name: mirror02.openafs.provider.opendev.org - label: ubuntu-focal - - name: mirror03.openafs.provider.opendev.org label: ubuntu-jammy - - name: mirror04.openafs.provider.opendev.org + - name: mirror02.openafs.provider.opendev.org label: ubuntu-noble groups: - <<: *bastion_group