From 451eca071bfccecea9e9736957cdaf3a9616d19a Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Fri, 5 Apr 2024 09:50:07 +0200
Subject: [PATCH] ci: Run tests also against CentOS 9 (OpenSSL 3.0)

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
---
 .github/workflows/build.yml     | 6 ++++--
 .github/workflows/distcheck.yml | 6 ++++--
 tests/setup-softhsm.sh          | 4 ++--
 tests/tecxc                     | 4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 49ebe75b..c938b432 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [fedora, debian]
+        name: [fedora, debian, centos]
         compiler: [gcc, clang]
         token: [softokn, softhsm]
         include:
@@ -22,11 +22,13 @@ jobs:
             container: fedora:latest
           - name: debian
             container: debian:sid
+          - name: centos
+            container: quay.io/centos/centos:stream9
     container: ${{ matrix.container }}
     steps:
       - name: Install Dependencies
         run: |
-            if [ -f /etc/fedora-release ]; then
+            if [ -f /etc/redhat-release ]; then
               dnf -y install git ${{ matrix.compiler }} automake libtool \
                 pkgconf-pkg-config autoconf-archive openssl-devel openssl \
                 diffutils expect valgrind
diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index 0e2d0fdb..ef12d765 100644
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -12,17 +12,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [fedora, debian]
+        name: [fedora, debian, centos]
         include:
           - name: fedora
             container: fedora:latest
           - name: debian
             container: debian:sid
+          - name: centos
+            container: quay.io/centos/centos:stream9
     container: ${{ matrix.container }}
     steps:
       - name: Install Dependencies
         run: |
-            if [ -f /etc/fedora-release ]; then
+            if [ -f /etc/redhat-release ]; then
               dnf -y install git gcc automake libtool expect \
                 pkgconf-pkg-config autoconf-archive openssl-devel openssl xz \
                 nss-softokn nss-tools nss-softokn-devel \
diff --git a/tests/setup-softhsm.sh b/tests/setup-softhsm.sh
index df535fcf..7eb1c567 100755
--- a/tests/setup-softhsm.sh
+++ b/tests/setup-softhsm.sh
@@ -305,8 +305,8 @@ echo "${ECPRI2URI}"
 echo "${ECCRT2URI}"
 echo ""
 
-if [ -f /etc/fedora-release ]; then
-    title PARA "explicit EC unsupported on Fedora"
+if [ -f /etc/redhat-release ]; then
+    title PARA "explicit EC unsupported on Fedora/EL"
 else
     title PARA "generate explicit EC key pair"
     KEYID='0007'
diff --git a/tests/tecxc b/tests/tecxc
index 50bbdb38..f0b2e708 100755
--- a/tests/tecxc
+++ b/tests/tecxc
@@ -2,9 +2,9 @@
 # Copyright (C) 2023 Simo Sorce <simo@redhat.com>
 # SPDX-License-Identifier: Apache-2.0
 
-# On Fedora they completely removed support for explicit EC from libcrypto,
+# On Fedora/EL completely removed support for explicit EC from libcrypto,
 # so skip the test completely
-if [ -f /etc/fedora-release ]; then
+if [ -f /etc/redhat-release ]; then
     exit 0
 fi