From 8e71d37d318849127e1cc53fbd5ffec0b34119b7 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 11 Jul 2023 12:41:30 -0700
Subject: [PATCH] Test on CentOS 9 Stream

Change-Id: Icc4d156748f9cd5b64a2a37cec53f51b13f9a0eb
---
 .zuul.yaml          | 19 +++++++++++++++++++
 tools/test-setup.sh | 12 ++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index 91259a5..d4d61da 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,9 +17,11 @@
         - openstack-tox-py310
         - pyeclib-tox-py27-centos-7
         - pyeclib-tox-py36-centos-8-stream
+        - pyeclib-tox-py39-centos-9-stream
         - libec-pyeclib-unit
         - libec-pyeclib-unit-centos-7
         - libec-pyeclib-unit-centos-8-stream
+        - libec-pyeclib-unit-centos-9-stream
     gate:
       jobs:
         - test-release-openstack:
@@ -35,9 +37,11 @@
         - openstack-tox-py310
         - pyeclib-tox-py27-centos-7
         - pyeclib-tox-py36-centos-8-stream
+        - pyeclib-tox-py39-centos-9-stream
         - libec-pyeclib-unit
         - libec-pyeclib-unit-centos-7
         - libec-pyeclib-unit-centos-8-stream
+        - libec-pyeclib-unit-centos-9-stream
     pre-release:
       jobs:
         - release-openstack-python:
@@ -63,6 +67,13 @@
       Run unit tests using ``py36`` environment on CentOS 8.
     nodeset: centos-8-stream
 
+- job:
+    name: pyeclib-tox-py39-centos-9-stream
+    parent: openstack-tox-py39
+    description: |
+      Run unit tests using ``py39`` environment on CentOS 9.
+    nodeset: centos-9-stream
+
 - job:
     name: libec-pyeclib-unit-centos-7
     parent: openstack-tox-py27
@@ -79,6 +90,14 @@
     vars:
       tox_envlist: py36-compilelibs
 
+- job:
+    name: libec-pyeclib-unit-centos-9-stream
+    parent: openstack-tox-py39
+    timeout: 1800
+    nodeset: centos-9-stream
+    vars:
+      tox_envlist: py39-compilelibs
+
 - job:
     name: libec-pyeclib-unit
     parent: openstack-tox-py39
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 926a1d6..0887a00 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -15,6 +15,11 @@ function is_rhel8 {
         cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
         cat /etc/*release | grep -q 'release 8'
 }
+function is_rhel9 {
+    [ -f /usr/bin/dnf ] && \
+        cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
+        cat /etc/*release | grep -q 'release 9'
+}
 
 
 if is_rhel7; then
@@ -32,3 +37,10 @@ if is_rhel8; then
     sudo dnf install -y centos-release-openstack-ussuri
     sudo dnf install -y liberasurecode-devel yasm
 fi
+
+if is_rhel9; then
+    # Install CentOS OpenStack repos so that we have access to some extra
+    # packages.
+    sudo dnf install -y centos-release-openstack-zed
+    sudo dnf install -y liberasurecode-devel nasm
+fi