From a22258583de9bd0d2558821d40d98a5e4fc1f7c6 Mon Sep 17 00:00:00 2001
From: TECHNOFAB <admin@technofab.de>
Date: Mon, 7 Oct 2024 16:59:30 +0000
Subject: [PATCH] ci: improve dogfooding by using the CI built images directly

---
 .gitlab-ci.yml | 5 ++++-
 flake.nix      | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ffc5b2..b0393fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,13 @@
 include:
   - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/nix-gitlab-ci@$CI_COMMIT_SHA
+    inputs:
+      image_tag: $CI_COMMIT_SHORT_SHA
 stages:
+  - build-images
   - build
   - trigger
 build:image:
-  stage: build
+  stage: build-images
   parallel:
     matrix:
       - VARIANT: ["", "-cachix", "-attic"]
diff --git a/flake.nix b/flake.nix
index 4553c2d..75868e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,9 +50,6 @@
           jobs = {
             "test" = {
               stage = "test";
-              # wait an hour so the image builds
-              when = "delayed";
-              start_in = "1 hour";
               nix = {
                 deps = [pkgs.hello pkgs.curl];
                 disable-cache = false;