From 0557eb205d1d6a239f55e4bedccbf22541970778 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Thu, 20 Jan 2022 14:26:04 -0600
Subject: [PATCH] ci: Try switching to "needs" instead to strict stages.

---
 .gitlab-ci.yml         | 17 +++++++++++++++--
 .gitlab-ci/ci.template |  7 +++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5623f426b..0affb15cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,6 +137,8 @@ arch:rolling:container_prep:
   extends:
     - .monado.variables.debian:bullseye
     - .fdo.distribution-image@debian # from ci-templates
+  needs:
+    - debian:bullseye:container_prep
 
 
 # Base for using Debian bullseye-ndk image
@@ -144,6 +146,8 @@ arch:rolling:container_prep:
   extends:
     - .monado.variables.debian:bullseye-ndk
     - .fdo.suffixed-image@debian # from ci-templates
+  needs:
+    - debian:bullseye-ndk:container_prep
 
 
 # Base for using Ubuntu focal image
@@ -151,6 +155,8 @@ arch:rolling:container_prep:
   extends:
     - .monado.variables.ubuntu:focal
     - .fdo.distribution-image@ubuntu # from ci-templates
+  needs:
+    - ubuntu:focal:container_prep
 
 
 # Base for using Ubuntu hirsute image
@@ -158,6 +164,8 @@ arch:rolling:container_prep:
   extends:
     - .monado.variables.ubuntu:hirsute
     - .fdo.distribution-image@ubuntu # from ci-templates
+  needs:
+    - ubuntu:hirsute:container_prep
 
 
 # Base for using Ubuntu impish image
@@ -165,6 +173,8 @@ arch:rolling:container_prep:
   extends:
     - .monado.variables.ubuntu:impish
     - .fdo.distribution-image@ubuntu # from ci-templates
+  needs:
+    - ubuntu:impish:container_prep
 
 
 # Base for using Arch rolling image
@@ -172,6 +182,8 @@ arch:rolling:container_prep:
   extends:
     - .monado.variables.arch:rolling
     - .fdo.distribution-image@arch # from ci-templates
+  needs:
+    - arch:rolling:container_prep
 
 
 # Style check job
@@ -528,7 +540,8 @@ reprepro:package:
     - .monado.image.ubuntu:impish
 
     - .monado.packaging.conditions
-  dependencies:
+  needs:
+    - ubuntu:impish:container_prep
     - debian:bullseye:package
     - ubuntu:focal:package
     - ubuntu:hirsute:package
@@ -547,7 +560,7 @@ pages:
   stage: pages
   only:
     - main
-  dependencies:
+  needs:
     - debian:cmake
     - reprepro:package
   script:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 43e7c7ffd..9d6a0d351 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -86,6 +86,8 @@ stages:
   extends:
     - .monado.variables.{{distro.name}}:{{image.codename}}
     - .fdo.{{ "suffixed" if "repo_suffix" in image else "distribution" }}-image@{{distro.name}} # from ci-templates
+  needs:
+    - {{distro.name}}:{{image.codename}}:container_prep
 
 {% endfor -%} {%- endfor %}
 
@@ -245,7 +247,8 @@ reprepro:package:
   extends:
     - {{ base_job_to_use_image_containing("reprepro") }}
     - .monado.packaging.conditions
-  dependencies:
+  needs:
+    - {{ base_job_to_use_image_containing("reprepro") | replace(".monado.image.", "") | trim + ":container_prep" }}
 {% for distro in distributions -%} {%- for image in distro.images if "deb_version_suffix" in image %}
     - {{packaging_job_name(distro, image)}}
 {% endfor -%} {%- endfor %}
@@ -263,7 +266,7 @@ pages:
   stage: pages
   only:
     - main
-  dependencies:
+  needs:
     - debian:cmake
     - reprepro:package
   script: