From 2494e8d4605a444a211dd53b515e6438b8f315fe Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdziora@redhat.com>
Date: Tue, 5 Sep 2023 13:54:09 +0200
Subject: [PATCH] Revert "Workaround 2236111."

This reverts commit be4df2356746b923d1e1ba3a33159ffb566e0ebb.

With tomcat-9.0.62-16.el9, the dependencies are fixed and tomcat
gets installed; tracked in 2184133.
---
 .github/workflows/build-test.yaml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index fed1f08b..bf5ab142 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ fedora-rawhide, fedora-38, fedora-37, centos-8-stream, rocky-9, rocky-8, almalinux-9, almalinux-8, centos-7 ]
+        os: [ fedora-rawhide, fedora-38, fedora-37, centos-9-stream, centos-8-stream, rocky-9, rocky-8, almalinux-9, almalinux-8, centos-7 ]
         docker: [ docker ]
         include:
           - os: rhel-9
@@ -112,6 +112,12 @@ jobs:
             readonly: --read-only
             ca: --external-ca
           - os: fedora-rawhide
+          - os: centos-9-stream
+          - os: centos-9-stream
+            readonly: --read-only
+          - os: centos-9-stream
+            readonly: --read-only
+            ca: --external-ca
           - os: centos-8-stream
           - os: centos-8-stream
             readonly: --read-only
@@ -149,6 +155,8 @@ jobs:
         include:
           - os: fedora-38
             readonly: --read-only
+          - os: centos-9-stream
+            readonly: --read-only
           - os: centos-8-stream
             readonly: --read-only
           - os: centos-7
@@ -184,7 +192,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ fedora-38, centos-8-stream ]
+        os: [ fedora-38, centos-9-stream, centos-8-stream ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
@@ -211,7 +219,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ fedora-38, rhel-9, rhel-8, centos-8-stream, rocky-9, rocky-8, almalinux-8 ]
+        os: [ fedora-38, rhel-9, rhel-8, centos-9-stream, centos-8-stream, rocky-9, rocky-8, almalinux-8 ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
@@ -339,7 +347,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ fedora-rawhide, fedora-38, rhel-9, rhel-8, centos-8-stream ]
+        os: [ fedora-rawhide, fedora-38, rhel-9, rhel-8, centos-9-stream, centos-8-stream ]
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/docker-cgroups-ubuntu-22
@@ -374,7 +382,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ fedora-38 ]
+        os: [ fedora-38, centos-9-stream ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
@@ -398,7 +406,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ fedora-38 ]
+        os: [ fedora-38, centos-9-stream ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
@@ -433,7 +441,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ fedora-rawhide, fedora-38, fedora-37, centos-8-stream, rocky-9, rocky-8, almalinux-9, almalinux-8, centos-7 ]
+        os: [ fedora-rawhide, fedora-38, fedora-37, centos-9-stream, centos-8-stream, rocky-9, rocky-8, almalinux-9, almalinux-8, centos-7 ]
     steps:
       - uses: actions/download-artifact@v3
         with: