From defab5eacde49e43e055305838b0361c842e9f2e Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 7 Dec 2021 16:24:52 -0800
Subject: [PATCH] Add CentOS 9 Stream job

Go ahead and move the FIPS job to CentOS 9; there doesn't seem to be
much value in having more than one FIPS job.

Change-Id: I8c2c95e490ec083116f2ed7b9fb0d66918424fb7
---
 .zuul.yaml                 | 25 ++++++++++++++++---------
 playbooks/enable-fips.yaml |  3 ++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 82ff46a..121cb2b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -30,20 +30,25 @@
       This job runs on CentOS 8 Stream.
 
 - job:
-    name: liberasurecode-unittests-centos-8-stream-fips
-    parent: liberasurecode-unittests-centos-8-stream
+    name: liberasurecode-unittests-centos-9-stream
+    parent: liberasurecode-unittests
+    nodeset: centos-9-stream
+    description: |
+      Build and run test and valgrind-test for liberasurecode.
+      This job runs on CentOS 9 Stream.
+
+- job:
+    name: liberasurecode-unittests-centos-9-stream-fips
+    parent: liberasurecode-unittests-centos-9-stream
     pre-run: playbooks/enable-fips.yaml
     description: |
       Build and run test and valgrind-test for liberasurecode.
-      This job runs on a FIPS-enabled CentOS 8 Stream system.
+      This job runs on a FIPS-enabled CentOS 9 Stream system.
 
 - job:
     name: liberasurecode-unittests-centos-8-stream-arm64
     parent: liberasurecode-unittests
-    nodeset:
-      nodes:
-        - name: libec-centos-8-stream-arm64
-          label: centos-8-stream-arm64
+    nodeset: centos-8-stream-arm64
     description: |
       Build and run test and valgrind-test for liberasurecode.
       This job runs on CentOS 8 Stream on arm64.
@@ -54,7 +59,8 @@
         - liberasurecode-unittests
         - liberasurecode-unittests-centos-7
         - liberasurecode-unittests-centos-8-stream
-        - liberasurecode-unittests-centos-8-stream-fips
+        - liberasurecode-unittests-centos-9-stream
+        - liberasurecode-unittests-centos-9-stream-fips
     check-arm64:
       jobs:
         - liberasurecode-unittests-arm64
@@ -64,4 +70,5 @@
         - liberasurecode-unittests
         - liberasurecode-unittests-centos-7
         - liberasurecode-unittests-centos-8-stream
-        - liberasurecode-unittests-centos-8-stream-fips
+        - liberasurecode-unittests-centos-9-stream
+        - liberasurecode-unittests-centos-9-stream-fips
diff --git a/playbooks/enable-fips.yaml b/playbooks/enable-fips.yaml
index bc1dc04..35a9c39 100644
--- a/playbooks/enable-fips.yaml
+++ b/playbooks/enable-fips.yaml
@@ -1,3 +1,4 @@
 - hosts: all
   roles:
-    - enable-fips
+    - role: enable-fips
+      nslookup_target: 'opendev.org'