From 2433597e81bcf9ef336696a2c0eb46976bedf6fd Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Tue, 11 Jun 2024 13:14:10 -0500
Subject: [PATCH] Don't use the openstack-ci-core/openafs PPA on noble and
 later

Also add zuul-role-integration jobs for noble to ensure things generally
work as expected on noble, and specifically verify from the testing logs
that the exclusion is effective.

Change-Id: Ic722e992038b3d740108594d80d66f0befc153c7
---
 .../tasks/openafs-client/Debian.yaml          |  2 ++
 zuul.d/system-config-roles.yaml               | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/roles/openafs-client/tasks/openafs-client/Debian.yaml b/roles/openafs-client/tasks/openafs-client/Debian.yaml
index 34af1da415..0187f09cfc 100644
--- a/roles/openafs-client/tasks/openafs-client/Debian.yaml
+++ b/roles/openafs-client/tasks/openafs-client/Debian.yaml
@@ -4,11 +4,13 @@
 # need fixed in production, and other things we've needed pulled in
 # like ARM64 support.  So that's why we maintain our own packages
 # here.
+# NOTE for noble (24.02) and beyond shouldn't need to use the PPA
 - name: Install openstackci openafs PPA on Ubuntu
   apt_repository:
     repo: 'ppa:openstack-ci-core/openafs'
   when:
     - ansible_distribution == 'Ubuntu'
+    - (ansible_distribution_major_version|int) <= 22
   become: yes
 
 - name: Install kernel headers dependency
diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml
index b117f1a465..f9dd6796f8 100644
--- a/zuul.d/system-config-roles.yaml
+++ b/zuul.d/system-config-roles.yaml
@@ -91,6 +91,18 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-noble
+    parent: system-config-zuul-role-integration
+    nodeset:
+      nodes:
+        - name: base
+          label: ubuntu-noble
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - job:
     name: system-config-zuul-role-integration-focal-arm64
     parent: system-config-zuul-role-integration
@@ -115,6 +127,18 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-noble-arm64
+    parent: system-config-zuul-role-integration
+    nodeset:
+      nodes:
+        - name: base
+          label: ubuntu-noble-arm64
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - job:
     name: system-config-zuul-role-integration-debian-bullseye
     parent: system-config-zuul-role-integration
@@ -199,6 +223,11 @@
         - system-config-zuul-role-integration-focal-arm64
         - system-config-zuul-role-integration-jammy
         - system-config-zuul-role-integration-jammy-arm64
+        - system-config-zuul-role-integration-noble
+        ## Non-voting until https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069781
+        ## is fixed and makes it into Debian/Ubuntu
+        - system-config-zuul-role-integration-noble-arm64:
+            voting: false
         - system-config-zuul-role-integration-debian-bullseye
         - system-config-zuul-role-integration-debian-bullseye-arm64
         - system-config-zuul-role-integration-debian-bookworm
@@ -214,6 +243,10 @@
         - system-config-zuul-role-integration-focal-arm64
         - system-config-zuul-role-integration-jammy
         - system-config-zuul-role-integration-jammy-arm64
+        - system-config-zuul-role-integration-noble
+        ## Disabled until https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069781
+        ## is fixed and makes it into Debian/Ubuntu
+        # - system-config-zuul-role-integration-noble-arm64
         - system-config-zuul-role-integration-debian-bullseye
         - system-config-zuul-role-integration-debian-bullseye-arm64
         - system-config-zuul-role-integration-debian-bookworm