From d3c928545f32463d1e4fb4fd1aaaa8d9a4cc2ebe Mon Sep 17 00:00:00 2001
From: mhorky <mhorky@redhat.com>
Date: Tue, 21 May 2024 13:33:53 +0200
Subject: [PATCH] feat(ci): Update testing matrix

- Test on CentOS Stream 10 instead of 9
  RHEL 9 has been branched off to `subscription-manager-1.29`
- Rawhide runs dnf5, we need to install builddep subcommand
---
 .github/workflows/libdnf.yml |  6 +++---
 .github/workflows/pytest.yml |  4 ++--
 .github/workflows/tito.yml   | 12 ++++++++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/libdnf.yml b/.github/workflows/libdnf.yml
index 6b0325a260..91425b0bec 100644
--- a/.github/workflows/libdnf.yml
+++ b/.github/workflows/libdnf.yml
@@ -12,8 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "CentOS Stream 9"
-            image: "quay.io/centos/centos:stream9"
+          - name: "CentOS Stream 10"
+            image: "quay.io/centos/centos:stream10-development"
           - name: "Fedora latest"
             image: "registry.fedoraproject.org/fedora:latest"
           - name: "Fedora Rawhide"
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Enable CRB repository"
-        if: ${{ matrix.name == 'CentOS Stream 9' }}
+        if: ${{ matrix.name == 'CentOS Stream 10' }}
         run: |
           dnf --setopt install_weak_deps=False install -y dnf-plugins-core
           dnf config-manager --enable crb
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 5dd10af399..a5bfd4e4c8 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -16,8 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "CentOS Stream 9"
-            image: "quay.io/centos/centos:stream9"
+          - name: "CentOS Stream 10"
+            image: "quay.io/centos/centos:stream10-development"
             pytest_args: ''
           - name: "Fedora latest"
             image: "registry.fedoraproject.org/fedora:latest"
diff --git a/.github/workflows/tito.yml b/.github/workflows/tito.yml
index cdf6af43ef..1541711de6 100644
--- a/.github/workflows/tito.yml
+++ b/.github/workflows/tito.yml
@@ -12,12 +12,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "CentOS Stream 9"
-            image: "quay.io/centos/centos:stream9"
+          - name: "CentOS Stream 10"
+            image: "quay.io/centos/centos:stream10-development"
+            packager: "dnf4"
           - name: "Fedora latest"
             image: "registry.fedoraproject.org/fedora:latest"
+            packager: "dnf4"
           - name: "Fedora Rawhide"
             image: "registry.fedoraproject.org/fedora:rawhide"
+            packager: "dnf5"
 
     runs-on: ubuntu-latest
     container:
@@ -43,6 +46,11 @@ jobs:
         run: |
           git config --global --add safe.directory '*'
 
+      - name: "Install builddep subcommand"
+        run: |
+          dnf --setopt install_weak_deps=False "dnf5-command(builddep)"
+        if: matrix.packager == 'dnf5'
+
       - name: Install packages
         run: |
           dnf --setopt install_weak_deps=False builddep -y \