From 54cead69d4a8f450986ae7218c58bc15a102375f Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 22 Feb 2021 10:25:25 -0800
Subject: [PATCH] Update nodepool launchers to focal in testing

We are beginning the process to start updating these servers from xenial
to focal. Update the system-config-run-nodepool test platform to reflect
this. We can land this once the production servers have been updated but
until then this should give us an idea if things are working properly.

Depends-On: https://review.opendev.org/c/openstack/project-config/+/776979
Change-Id: Id6b32a950b69ed15fb1ce54c880b66b379b02fdf
---
 testinfra/test_nodepool.py    | 4 ++--
 zuul.d/system-config-run.yaml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testinfra/test_nodepool.py b/testinfra/test_nodepool.py
index 2bf45a00be..74b754967e 100644
--- a/testinfra/test_nodepool.py
+++ b/testinfra/test_nodepool.py
@@ -14,7 +14,7 @@
 
 import pytest
 
-testinfra_hosts = ['nl01.openstack.org', 'nb01.opendev.org']
+testinfra_hosts = ['nl01.opendev.org', 'nb01.opendev.org']
 
 
 def test_clouds_yaml(host):
@@ -33,7 +33,7 @@ def test_kube_config(host):
     assert b'nodepool_k8s_key' in kubeconfig.content
 
 def test_launcher_container_running(host):
-    if host.backend.get_hostname() != 'nl01.openstack.org':
+    if host.backend.get_hostname() != 'nl01.opendev.org':
         pytest.skip()
 
     cmd = host.run("docker ps -a --format '{{ .Names }}'")
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 7a2b2dd64a..e9444a5011 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -231,8 +231,8 @@
           label: ubuntu-bionic
         - name: zk01.opendev.org
           label: ubuntu-bionic
-        - name: nl01.openstack.org
-          label: ubuntu-xenial
+        - name: nl01.opendev.org
+          label: ubuntu-focal
         - name: nb01.opendev.org
           label: ubuntu-bionic
     required-projects:
@@ -240,7 +240,7 @@
       - opendev/system-config
       - openstack/project-config
     host-vars:
-      nl01.openstack.org:
+      nl01.opendev.org:
         host_copy_output:
           '/etc/nodepool/nodepool.yaml': logs
           '/var/log/nodepool/launcher-debug.log': logs