From 32f0fa7704c4ae321ca4161a347b7b8fe0aecced Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 29 2024 17:27:10 +0000
Subject: [PATCH 1/3] Revert "ci: Temporarily skip building the base variant"


This reverts commit a4d4263ee8315d8ba3d181e779817971e3185996.

---

diff --git a/ci/validate.yaml b/ci/validate.yaml
index 36799ce..be7ae1b 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -86,15 +86,10 @@
       # Still run the next step if this one fails
       ignore_errors: true
 
-    - name: Perform dependency resolution for the base variant
-      ansible.builtin.shell:
+    - name: Compose the base variant
+      ansible.builtin.command:
         chdir: "{{ zuul.project.src_dir }}"
-        cmd: "just compose-dry-run base-atomic"
-
-    # - name: Compose the base variant
-    #   ansible.builtin.command:
-    #     chdir: "{{ zuul.project.src_dir }}"
-    #     cmd: just compose-image base-atomic
+        cmd: just compose-image base-atomic
 
     - name: Check if any previous dependency resolution steps failed
       ansible.builtin.shell:

From cf2612eb87594d118c3d75f0ec451d2bccf923c3 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 29 2024 17:27:10 +0000
Subject: [PATCH 2/3] ci: Manually install python3-libdnf5 first


See: https://pagure.io/fedora-ci/general/issue/474

---

diff --git a/ci/validate.yaml b/ci/validate.yaml
index be7ae1b..eaa665f 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -1,5 +1,9 @@
 - hosts: all
   tasks:
+    - name: Install system dependencies
+      shell: dnf install -y python3-libdnf5
+      become: true
+
     - name: Upgrade all packages
       ansible.builtin.dnf:
         name: "*"

From cc7acc71561171b80abf622f7429751bb08ef56d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 29 2024 17:27:10 +0000
Subject: [PATCH 3/3] ci: Use Rawhide cloud image again


---

diff --git a/.zuul.yaml b/.zuul.yaml
index 8779dc8..7c7f530 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -14,6 +14,4 @@
         - name: vm
           # Replace by a fixed version label after branching, once available:
           # https://fedora.softwarefactory-project.io/zuul/labels
-          # See: https://pagure.io/fedora-ci/general/issue/474
-          # label: cloud-fedora-rawhide-medium
-          label: cloud-fedora-40-medium
+          label: cloud-fedora-rawhide-medium