From 97a2ef27f564ed1a671229bd1d25bf7f034fb536 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 24 Jun 2024 15:08:07 -0700
Subject: [PATCH] Drop more Xenial testing from system-config

This drops xenial testing of our base roles from system-config. This
Xenial cleanup change is probably one of the more risky ones while we
still have Xenial nodes in the real world. The reason for that is the
base roles are applied in a dedicated job and if that job fails a lot of
other jobs will refuse to run. Since we're no longer testing xenial
against those roles once this changes merges we may run into unexpected
failures.

That said we don't have much way around this if we're going to drop
xenial test nodes. Perhaps we should hold off on merging this change
until we're closer to removing xenial from nodepool though.

Change-Id: I25bddd7455d79c2d96c36d4fb0dd1267954d6d17
---
 testinfra/test_base.py          | 29 +++++++++--------------------
 zuul.d/system-config-roles.yaml | 19 -------------------
 zuul.d/system-config-run.yaml   |  4 ----
 3 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/testinfra/test_base.py b/testinfra/test_base.py
index d5a88510e1..5a6eb8c6d1 100644
--- a/testinfra/test_base.py
+++ b/testinfra/test_base.py
@@ -39,29 +39,18 @@ def test_iptables(host):
 
 def test_ntp(host):
     package = host.package("ntp")
-    if host.system_info.codename in ('xenial'):
-        assert package.is_installed
+    assert not package.is_installed
 
-        if host.system_info.distribution in ['ubuntu', 'debian']:
-            service = host.service("ntp")
-        else:
-            service = host.service("ntpd")
-        assert service.is_running
-        assert service.is_enabled
+    service = host.service('systemd-timesyncd')
+    assert service.is_running
 
+    # Focal updates the status string to just say NTP
+    if host.system_info.codename == 'bionic':
+        stdout_string = 'systemd-timesyncd.service active'
     else:
-        assert not package.is_installed
-
-        service = host.service('systemd-timesyncd')
-        assert service.is_running
-
-        # Focal updates the status string to just say NTP
-        if host.system_info.codename == 'bionic':
-            stdout_string = 'systemd-timesyncd.service active'
-        else:
-            stdout_string = 'NTP service: active'
-        cmd = host.run("timedatectl status")
-        assert stdout_string in cmd.stdout
+        stdout_string = 'NTP service: active'
+    cmd = host.run("timedatectl status")
+    assert stdout_string in cmd.stdout
 
 
 def test_snmp(host):
diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml
index a00ed51831..20647c42b7 100644
--- a/zuul.d/system-config-roles.yaml
+++ b/zuul.d/system-config-roles.yaml
@@ -26,23 +26,6 @@
         # for build logs
         '/var/lib/dkms-make-logs': logs
 
-- job:
-    name: system-config-zuul-role-integration-xenial
-    parent: system-config-zuul-role-integration
-    nodeset:
-      nodes:
-        - name: base
-          label: ubuntu-xenial
-        - name: puppet4
-          label: ubuntu-xenial
-      groups:
-        - name: puppet3
-          nodes:
-            - base
-        - name: openafs
-          nodes:
-            - base
-
 - job:
     name: system-config-zuul-role-integration-bionic
     parent: system-config-zuul-role-integration
@@ -216,7 +199,6 @@
     name: system-config-zuul-role-integration
     check:
       jobs:
-        - system-config-zuul-role-integration-xenial
         - system-config-zuul-role-integration-bionic
         - system-config-zuul-role-integration-bionic-arm64
         - system-config-zuul-role-integration-focal
@@ -233,7 +215,6 @@
         - system-config-zuul-role-integration-centos-9-stream-arm64
     gate:
       jobs:
-        - system-config-zuul-role-integration-xenial
         - system-config-zuul-role-integration-bionic
         - system-config-zuul-role-integration-bionic-arm64
         - system-config-zuul-role-integration-focal
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index d39b75cd96..2c27feeb8a 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -60,8 +60,6 @@
     nodeset:
       nodes:
         - &bridge_node_x86 { name: bridge99.opendev.org, label: ubuntu-jammy }
-        - name: xenial
-          label: ubuntu-xenial
         - name: bionic
           label: ubuntu-bionic
         - name: focal
@@ -97,8 +95,6 @@
     nodeset:
       nodes:
         - <<: *bridge_node_x86
-        - name: xenial
-          label: ubuntu-xenial
         - name: bionic
           label: ubuntu-bionic
         - name: focal