From cca0c34e7b530ea74248b64fd4bccf89cc3bd740 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Wed, 10 Jan 2024 16:05:53 +1100
Subject: [PATCH] Switch meetpad test servers to jammy

Also while we're there use 99 as the host index to make it slightly
harder to confuse testing with production.

Change-Id: I62193418feb9401fc06da39bd100553aef3dc52d
---
 playbooks/zuul/templates/group_vars/jvb.yaml.j2     | 9 ++++++++-
 playbooks/zuul/templates/group_vars/meetpad.yaml.j2 | 9 ++++++++-
 testinfra/test_meetpad.py                           | 2 +-
 zuul.d/system-config-run.yaml                       | 8 ++++----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/playbooks/zuul/templates/group_vars/jvb.yaml.j2 b/playbooks/zuul/templates/group_vars/jvb.yaml.j2
index bc023ab799..09c5ee864d 100644
--- a/playbooks/zuul/templates/group_vars/jvb.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/jvb.yaml.j2
@@ -1,3 +1,10 @@
-jitsi_meet_public_url: https://meetpad01.opendev.org
+jitsi_meet_public_url: https://meetpad99.opendev.org
+{#- NOTE: Here we're setting the IP address for the XMPP endpoint.  In
+    testing we need to use the correct *testing* host.  We also select the
+    .public_v4 value rather than .ansible_host (from-the prod vars) as this
+    matches the way we configure iptables on the meetpad server. -#}
+{%- raw %}
+meetpad_jvb_xmpp_server: "{{ hostvars['meetpad99.opendev.org'].public_v4 }}"
+{% endraw -%}
 meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0
 meetpad_jvb_keystore_password: ateeweegoLee3aig5eish8aeraetiG
diff --git a/playbooks/zuul/templates/group_vars/meetpad.yaml.j2 b/playbooks/zuul/templates/group_vars/meetpad.yaml.j2
index c49a9697ba..e4d7a37811 100644
--- a/playbooks/zuul/templates/group_vars/meetpad.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/meetpad.yaml.j2
@@ -1,4 +1,11 @@
-jitsi_meet_public_url: https://meetpad01.opendev.org
+jitsi_meet_public_url: https://meetpad99.opendev.org
+{#- NOTE): Here we're setting the IP address for the XMPP endpoint.  In
+    testing we need to use the correct *testing* host.  We also select the
+    .public_v4 value rather than .ansible_host (from-the prod vars) as this
+    matches the way we configure iptables on the meetpad server. -#}
+{%- raw %}
+meetpad_jvb_xmpp_server: "{{ hostvars['meetpad99.opendev.org'].public_v4 }}"
+{% endraw -%}
 meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0
 meetpad_jvb_keystore_password: ateeweegoLee3aig5eish8aeraetiG
 meetpad_jicofo_component_secret: 3bcd6b4494d99de7ff7b64b931d394f6
diff --git a/testinfra/test_meetpad.py b/testinfra/test_meetpad.py
index 186816d7a4..45fb733af3 100644
--- a/testinfra/test_meetpad.py
+++ b/testinfra/test_meetpad.py
@@ -14,7 +14,7 @@
 
 import time
 
-testinfra_hosts = ['meetpad01.opendev.org']
+testinfra_hosts = ['meetpad99.opendev.org']
 
 
 def test_jitsi_meet_listening(host):
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 8ebbfc0a74..12f5d9ccff 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -812,10 +812,10 @@
     nodeset:
       nodes:
         - <<: *bridge_node_x86
-        - name: meetpad01.opendev.org
-          label: ubuntu-bionic
-        - name: jvb01.opendev.org
-          label: ubuntu-bionic
+        - name: meetpad99.opendev.org
+          label: ubuntu-jammy
+        - name: jvb99.opendev.org
+          label: ubuntu-jammy
       groups:
         - <<: *bastion_group
     vars: