From a4dc20da5feb3c4a48b7d455d94a3b7f252edee2 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 28 2024 11:05:50 +0000
Subject: [PATCH 1/4] ci: Use just recipes for all tests


---

diff --git a/ci/validate.yaml b/ci/validate.yaml
index 4d8d78c..9483ff3 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -2,10 +2,10 @@
    tasks:
      - name: Install dependencies
        package:
-         name: ['python3-pyyaml']
+         name: ['just', 'python3-pyyaml']
          state: present
        become: yes
      - name: Validate manifests and scripts syntax
        ansible.builtin.command:
          chdir: "{{ zuul.project.src_dir }}"
-         cmd: ci/validate
+         cmd: just validate

From 5a9096b17eab2ca3c4d23308d4991602636f615c Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 28 2024 11:05:50 +0000
Subject: [PATCH 2/4] justfile: Add compose-dry-run recipe


To use in CI to perform dependency resolution for all official variants.

---

diff --git a/justfile b/justfile
index dbc773b..210f336 100644
--- a/justfile
+++ b/justfile
@@ -86,6 +86,22 @@ manifest variant=default_variant:
 
     rpm-ostree compose tree --print-only --repo=repo fedora-{{variant}}.yaml
 
+# Perform dependency resolution for all official variants
+compose-dry-run:
+    #!/bin/bash
+    set -euxo pipefail
+
+    mkdir -p repo cache logs
+    if [[ ! -f "repo/config" ]]; then
+        pushd repo > /dev/null || exit 1
+        ostree init --repo . --mode=bare-user
+        popd > /dev/null || exit 1
+    fi
+
+    for v in "silverblue" "kinoite" "sericea" "onyx"; do
+        rpm-ostree compose tree --unified-core --repo=repo --dry-run "fedora-${v}.yaml"
+    done
+
 # Alias/shortcut for compose-image command
 compose variant=default_variant: (compose-image variant)
 

From 1b7d4e8e52bfa3bddfa5671399d2ee9fc20a76f9 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 28 2024 11:05:50 +0000
Subject: [PATCH 3/4] ci: Perform dependency resolution for all variants


---

diff --git a/ci/validate.yaml b/ci/validate.yaml
index 9483ff3..038ecdb 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -2,10 +2,18 @@
    tasks:
      - name: Install dependencies
        package:
-         name: ['just', 'python3-pyyaml']
+         name:
+           - 'just'
+           - 'ostree'
+           - 'python3-pyyaml'
+           - 'rpm-ostree'
          state: present
        become: yes
      - name: Validate manifests and scripts syntax
        ansible.builtin.command:
          chdir: "{{ zuul.project.src_dir }}"
          cmd: just validate
+     - name: Perform dependency resolution for all variants
+       ansible.builtin.command:
+         chdir: "{{ zuul.project.src_dir }}"
+         cmd: just compose-dry-run

From 4b1160724fe66ec76f43f345061aa7cef6e9d9dc Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 28 2024 11:05:50 +0000
Subject: [PATCH 4/4] ci: Reformat package lists


---

diff --git a/ci/compose-base.yaml b/ci/compose-base.yaml
index fe067a0..a5017b0 100644
--- a/ci/compose-base.yaml
+++ b/ci/compose-base.yaml
@@ -2,7 +2,13 @@
    tasks:
      - name: Install dependencies
        package:
-         name: ['jq', 'just', 'ostree', 'python3-pyyaml', 'rpm-ostree', 'selinux-policy-targeted']
+         name:
+           - 'jq'
+           - 'just'
+           - 'ostree'
+           - 'python3-pyyaml'
+           - 'rpm-ostree'
+           - 'selinux-policy-targeted'
          state: present
        become: yes
      - name: Compose the base variant