From 9c299f82e8c64959fe1ca6447a4a443362d3ef0b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 21 Feb 2024 10:22:13 -0800
Subject: [PATCH] Replace buster with bookworm in role integration testing

Buster is the old old release of debian having been succeeded by
bullseye and bookworm. Drop buster testing in preparation for buster
test environment removal and add bookworm.

Note the arm64 job is marked nonvoting because there is a bug building
openafs on bookworm. This same issue shows up in nixos [0], and I have
reported it to openafs via their IRC channel where someone is working to
correct the problem upstream. Hopefully we can get a fix backported into
the distro package.

[0] https://github.com/NixOS/nixpkgs/issues/284501

Change-Id: I5b7e2e0cabb5123c48d745e9e84df96130217683
---
 zuul.d/system-config-roles.yaml | 40 +++++++++++++++++----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml
index 672f2e4505..a00ed51831 100644
--- a/zuul.d/system-config-roles.yaml
+++ b/zuul.d/system-config-roles.yaml
@@ -15,6 +15,7 @@
       - roles/puppet-install
       - roles/openafs-client
       - roles/kerberos-client
+      - roles-test/
     vars:
       zuul_copy_output: "{{ copy_output | combine(host_copy_output | default({})) }}"
       stage_dir: "{{ ansible_user_dir }}/zuul-output"
@@ -22,7 +23,7 @@
         '/var/log/syslog': logs_txt
         '/var/log/messages': logs_txt
         '/var/log/openafs': logs
-        # for build logs on centos
+        # for build logs
         '/var/lib/dkms-make-logs': logs
 
 - job:
@@ -114,18 +115,6 @@
           nodes:
             - base
 
-- job:
-    name: system-config-zuul-role-integration-debian-buster
-    parent: system-config-zuul-role-integration
-    nodeset:
-      nodes:
-        - name: base
-          label: debian-buster
-      groups:
-        - name: openafs
-          nodes:
-            - base
-
 - job:
     name: system-config-zuul-role-integration-debian-bullseye
     parent: system-config-zuul-role-integration
@@ -139,12 +128,12 @@
             - base
 
 - job:
-    name: system-config-zuul-role-integration-debian-buster-arm64
+    name: system-config-zuul-role-integration-debian-bookworm
     parent: system-config-zuul-role-integration
     nodeset:
       nodes:
         - name: base
-          label: debian-buster-arm64
+          label: debian-bookworm
       groups:
         - name: openafs
           nodes:
@@ -162,6 +151,19 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-debian-bookworm-arm64
+    parent: system-config-zuul-role-integration
+    voting: false
+    nodeset:
+      nodes:
+        - name: base
+          label: debian-bookworm-arm64
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - job:
     name: system-config-zuul-role-integration-centos-8-stream
     parent: system-config-zuul-role-integration
@@ -221,10 +223,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-debian-buster
-        - system-config-zuul-role-integration-debian-buster-arm64
         - system-config-zuul-role-integration-debian-bullseye
         - system-config-zuul-role-integration-debian-bullseye-arm64
+        - system-config-zuul-role-integration-debian-bookworm
+        - system-config-zuul-role-integration-debian-bookworm-arm64
         - system-config-zuul-role-integration-centos-8-stream
         - system-config-zuul-role-integration-centos-8-stream-arm64
         - system-config-zuul-role-integration-centos-9-stream
@@ -238,10 +240,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-debian-buster
-        - system-config-zuul-role-integration-debian-buster-arm64
         - system-config-zuul-role-integration-debian-bullseye
         - system-config-zuul-role-integration-debian-bullseye-arm64
+        - system-config-zuul-role-integration-debian-bookworm
+        - system-config-zuul-role-integration-debian-bookworm-arm64
         - system-config-zuul-role-integration-centos-8-stream
         - system-config-zuul-role-integration-centos-8-stream-arm64
         - system-config-zuul-role-integration-centos-9-stream