From 810008b1ea820eb3053c76e8a591db16eccdc397 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Wed, 26 Jun 2024 21:51:54 -0500
Subject: [PATCH] Skip restore step

With the new cache setup, there is no need for me to run the cache
restore before doing a download. However, it is now once again necessary
that download begin AFTER the dynamic scripts have already executed
their bits
---
 .gitlab-ci-build.yml.in |  4 ++--
 .gitlab-ci.yml          | 32 +++++++++++++++-----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci-build.yml.in b/.gitlab-ci-build.yml.in
index 3b07a05..cf9f0cf 100644
--- a/.gitlab-ci-build.yml.in
+++ b/.gitlab-ci-build.yml.in
@@ -20,7 +20,7 @@ stages:
         EXCEPT: '-except=upload'
   needs:
     - pipeline: $PARENT_PIPELINE_ID
-      job: distros
+      job: continue
       artifacts: true
     - pipeline: $PARENT_PIPELINE_ID
       job: generate
@@ -82,7 +82,7 @@ hyperv-iso.amd64:
   script: echo "Tagging as released"
   needs:
     - pipeline: $PARENT_PIPELINE_ID
-      job: distros
+      job: continue
       artifacts: true
   release:
     tag_name: '$CI_COMMIT_TAG'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58ad4c3..b246230 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 stages:
   - generate
-  - lint
+  - check
   - trigger
 
 variables:
@@ -20,7 +20,7 @@ generate:
       bash "./${vars}"
     done
 
-distros:
+continue:
   stage: generate
   artifacts:
     reports:
@@ -34,8 +34,14 @@ distros:
     - cp result .gitlab-ci-build.yml
     - cat result
 
+shellcheck:
+  stage: generate
+  tags:
+    - nix
+  script: nix run ".#shellcheck"
+
 validate:
-  stage: lint
+  stage: check
   tags:
     - nix
   needs:
@@ -48,22 +54,15 @@ validate:
         - ./packer_config/
   script: nix run ".#validate"
 
-shellcheck:
-  stage: lint
-  tags:
-    - nix
-  script: nix run ".#shellcheck"
-
-# Downloads all the ISO files so that we have a single cache with all
-# of them present. This prevents a race condition where some of the
-# files were being downloaded multiple times due to parallel jobs, and
-# others were disappearing (e.g. daily builds for Rawhide) before we
-# could get to them
+# Makes sure that all of the ISO files we are looking for are
+# present on the S3 buckets that we use
 downloads:
-  stage: generate
+  stage: check
   retry: 2
   tags:
     - nix
+  needs:
+    - generate
   cache:
     - key:
         files:
@@ -71,7 +70,6 @@ downloads:
       paths:
         - ./packer_config/
   script:
-    - nix run ".#cache-restore"
     - nix run ".#cache"
 
 trigger:
@@ -79,6 +77,6 @@ trigger:
   trigger:
     include:
       - artifact: .gitlab-ci-build.yml
-        job: distros
+        job: continue
   variables:
     PARENT_PIPELINE_ID: $CI_PIPELINE_ID