From 3587add6e418141a23845ceff5e32b44723d43e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 26 Jul 2024 17:14:40 +0200
Subject: [PATCH] ci: Check dependency resolution for classic ostree variants

With the split between classic ostree variants and the Bootable
Container ones, we are starting to diverge in package set for those
images.

Make sure to validate dependency resolution for both variants.
---
 ci/validate.yaml | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/ci/validate.yaml b/ci/validate.yaml
index a7b1bbb..be7ae1b 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -37,6 +37,13 @@
       # Still run the next step if this one fails
       ignore_errors: true
 
+    - name: Perform dependency resolution for Silverblue (ostree classic)
+      ansible.builtin.shell:
+        chdir: "{{ zuul.project.src_dir }}"
+        cmd: "just compose-dry-run silverblue-ostree && touch .zuulci.silverblue-ostree"
+      # Still run the next step if this one fails
+      ignore_errors: true
+
     - name: Perform dependency resolution for Kinoite
       ansible.builtin.shell:
         chdir: "{{ zuul.project.src_dir }}"
@@ -44,6 +51,13 @@
       # Still run the next step if this one fails
       ignore_errors: true
 
+    - name: Perform dependency resolution for Kinoite (ostree classic)
+      ansible.builtin.shell:
+        chdir: "{{ zuul.project.src_dir }}"
+        cmd: "just compose-dry-run kinoite-ostree && touch .zuulci.kinoite-ostree"
+      # Still run the next step if this one fails
+      ignore_errors: true
+
     - name: Perform dependency resolution for Sway Atomic
       ansible.builtin.shell:
         chdir: "{{ zuul.project.src_dir }}"
@@ -51,6 +65,13 @@
       # Still run the next step if this one fails
       ignore_errors: true
 
+    - name: Perform dependency resolution for Sway Atomic (ostree classic)
+      ansible.builtin.shell:
+        chdir: "{{ zuul.project.src_dir }}"
+        cmd: "just compose-dry-run sway-atomic-ostree && touch .zuulci.sway-atomic-ostree"
+      # Still run the next step if this one fails
+      ignore_errors: true
+
     - name: Perform dependency resolution for Budgie Atomic
       ansible.builtin.shell:
         chdir: "{{ zuul.project.src_dir }}"
@@ -58,6 +79,13 @@
       # Still run the next step if this one fails
       ignore_errors: true
 
+    - name: Perform dependency resolution for Budgie Atomic (ostree classic)
+      ansible.builtin.shell:
+        chdir: "{{ zuul.project.src_dir }}"
+        cmd: "just compose-dry-run budgie-atomic-ostree && touch .zuulci.budgie-atomic-ostree"
+      # Still run the next step if this one fails
+      ignore_errors: true
+
     - name: Compose the base variant
       ansible.builtin.command:
         chdir: "{{ zuul.project.src_dir }}"
@@ -66,4 +94,4 @@
     - name: Check if any previous dependency resolution steps failed
       ansible.builtin.shell:
         chdir: "{{ zuul.project.src_dir }}"
-        cmd: "[[ -f .zuulci.comps ]] &&  [[ -f .zuulci.silverblue ]] && [[ -f .zuulci.kinoite ]] && [[ -f .zuulci.sway-atomic ]] && [[ -f .zuulci.budgie-atomic ]]"
+        cmd: "[[ -f .zuulci.comps ]] &&  [[ -f .zuulci.silverblue ]] &&  [[ -f .zuulci.silverblue-ostree ]] && [[ -f .zuulci.kinoite ]] && [[ -f .zuulci.kinoite-ostree ]] && [[ -f .zuulci.sway-atomic ]] && [[ -f .zuulci.sway-atomic-ostree ]] && [[ -f .zuulci.budgie-atomic ]]  && [[ -f .zuulci.budgie-atomic-ostree ]]"