From f223a237a26ec540d9cff15a5c383941906a7e33 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Tue, 31 Oct 2023 09:47:28 -0500 Subject: [PATCH] Add a jammy test node for regional mirrors Change-Id: I922af92e523407b7324f020732fad52b98f027e1 --- .../roles/letsencrypt-create-certs/handlers/main.yaml | 3 +++ playbooks/zuul/run-base.yaml | 1 + playbooks/zuul/templates/gate-groups.yaml.j2 | 1 + .../mirror03.openafs.provider.opendev.org.yaml.j2 | 4 ++++ testinfra/test_mirror.py | 3 ++- zuul.d/system-config-run.yaml | 7 +++++++ 6 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 playbooks/zuul/templates/host_vars/mirror03.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 a6fd149774..8e44b437e0 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -238,6 +238,9 @@ - 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 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 79bb71e67b..5252a15565 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -146,6 +146,7 @@ - host_vars/grafana01.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/mirror-update99.opendev.org.yaml - host_vars/paste99.opendev.org.yaml - host_vars/refstack01.openstack.org.yaml diff --git a/playbooks/zuul/templates/gate-groups.yaml.j2 b/playbooks/zuul/templates/gate-groups.yaml.j2 index f2b754a21e..ab3ab231ec 100644 --- a/playbooks/zuul/templates/gate-groups.yaml.j2 +++ b/playbooks/zuul/templates/gate-groups.yaml.j2 @@ -13,6 +13,7 @@ groups: - letsencrypt02.opendev.org - mirror01.openafs.provider.opendev.org - mirror02.openafs.provider.opendev.org + - mirror03.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 new file mode 100644 index 0000000000..b0cd2da5af --- /dev/null +++ b/playbooks/zuul/templates/host_vars/mirror03.openafs.provider.opendev.org.yaml.j2 @@ -0,0 +1,4 @@ +letsencrypt_certs: + mirror03-openafs-provider-opendev-org-main: + - mirror03.openafs.provider.opendev.org + - mirror.openafs.provider.opendev.org diff --git a/testinfra/test_mirror.py b/testinfra/test_mirror.py index fa32a3ea96..d1d257ad57 100644 --- a/testinfra/test_mirror.py +++ b/testinfra/test_mirror.py @@ -17,7 +17,8 @@ import json testinfra_hosts = ['mirror01.openafs.provider.opendev.org', - 'mirror02.openafs.provider.opendev.org'] + 'mirror02.openafs.provider.opendev.org', + 'mirror03.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 248cab0d33..088e5c51b7 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -473,6 +473,11 @@ '/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/ @@ -495,6 +500,8 @@ label: ubuntu-bionic - name: mirror02.openafs.provider.opendev.org label: ubuntu-focal + - name: mirror03.openafs.provider.opendev.org + label: ubuntu-jammy groups: - <<: *bastion_group