From d4cfe90c4b0a3e30aa2857d1f1398afc88d7a427 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Tue, 10 Mar 2026 12:33:57 -0400
Subject: [PATCH] Build all images again

---
 .gitlab-ci.yml | 157 +++++++++++++++++++++++++------------------------
 1 file changed, 79 insertions(+), 78 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d123ad5..771d49c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,9 @@ variables:
   DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client
   RUST_LOG_STYLE: always
   BB_SIGNING_DRIVER: sigstore
-  # BB_BUILD_CHUNKED_OCI: 'true'
-  # BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '128'
+  BB_BUILD_CHUNKED_OCI: 'true'
+  BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '128'
+  BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
   BB_BUILD_PUSH: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
@@ -40,43 +41,43 @@ default:
   script:
     - bluebuild build "./recipes/${RECIPE}"
 
-# base-images:
-#   extends:
-#     - .build
-#   stage: base-images
-#   variables:
-#     BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '64'
-#   rules:
-#     # Run when any of the base recipes change
-#     - changes:
-#         - recipes/base*.yml
-#         - recipes/base/*
-#         - .gitlab-ci.yml
-#       when: always
-#     # Run on a scheduled pipeline (weekly or otherwise)
-#     - if: $CI_PIPELINE_SOURCE == "schedule"
-#       when: always
-#     # All other cases: do not run
-#     - when: never
-#   parallel:
-#     matrix:
-#       - RECIPE:
-#           - base.yml
-#           # - base-nvidia.yml
-#           # - base-cosmic.yml
-#           # - base-cosmic-nvidia.yml
-#           - base-kinoite.yml
-#           - base-kinoite-nvidia.yml
-#           - base-combo.yml
-#           - base-combo-nvidia.yml
+base-images:
+  extends:
+    - .build
+  stage: base-images
+  variables:
+    BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '64'
+  rules:
+    # Run when any of the base recipes change
+    - changes:
+        - recipes/base*.yml
+        - recipes/base/*
+        - .gitlab-ci.yml
+      when: always
+    # Run on a scheduled pipeline (weekly or otherwise)
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: always
+    # All other cases: do not run
+    - when: never
+  parallel:
+    matrix:
+      - RECIPE:
+          - base.yml
+          # - base-nvidia.yml
+          # - base-cosmic.yml
+          # - base-cosmic-nvidia.yml
+          - base-kinoite.yml
+          - base-kinoite-nvidia.yml
+          - base-combo.yml
+          - base-combo-nvidia.yml
 
 wke-images:
   extends:
     - .build
   stage: build
-  # needs:
-  #   - job: 'base-images: [base.yml]'
-  #     optional: true
+  needs:
+    - job: 'base-images: [base.yml]'
+      optional: true
   parallel:
     matrix:
       - RECIPE:
@@ -84,50 +85,50 @@ wke-images:
           - wke-fw-desktop.yml
           - wke-server.yml
 
-# kinoite-images:
-#   extends:
-#     - .build
-#   stage: build
-#   needs:
-#     - job: 'base-images: [base-kinoite.yml]'
-#       optional: true
-#   parallel:
-#     matrix:
-#       - RECIPE:
-#           - cp-laptop.yml
+kinoite-images:
+  extends:
+    - .build
+  stage: build
+  needs:
+    - job: 'base-images: [base-kinoite.yml]'
+      optional: true
+  parallel:
+    matrix:
+      - RECIPE:
+          - cp-laptop.yml
 
-# kinoite-nvidia-images:
-#   extends:
-#     - .build
-#   stage: build
-#   needs:
-#     - job: 'base-images: [base-kinoite-nvidia.yml]'
-#       optional: true
-#   parallel:
-#     matrix:
-#       - RECIPE:
-#           - pg-desktop-nvidia.yml
+kinoite-nvidia-images:
+  extends:
+    - .build
+  stage: build
+  needs:
+    - job: 'base-images: [base-kinoite-nvidia.yml]'
+      optional: true
+  parallel:
+    matrix:
+      - RECIPE:
+          - pg-desktop-nvidia.yml
 
-# combo-images:
-#   extends:
-#     - .build
-#   stage: build
-#   needs:
-#     - job: 'base-images: [base-combo.yml]'
-#       optional: true
-#   parallel:
-#     matrix:
-#       - RECIPE:
-#           - jp-laptop.yml
+combo-images:
+  extends:
+    - .build
+  stage: build
+  needs:
+    - job: 'base-images: [base-combo.yml]'
+      optional: true
+  parallel:
+    matrix:
+      - RECIPE:
+          - jp-laptop.yml
 
-# combo-nvidia-images:
-#   extends:
-#     - .build
-#   stage: build
-#   needs:
-#     - job: 'base-images: [base-combo-nvidia.yml]'
-#       optional: true
-#   parallel:
-#     matrix:
-#       - RECIPE:
-#           - jp-desktop-nvidia.yml
+combo-nvidia-images:
+  extends:
+    - .build
+  stage: build
+  needs:
+    - job: 'base-images: [base-combo-nvidia.yml]'
+      optional: true
+  parallel:
+    matrix:
+      - RECIPE:
+          - jp-desktop-nvidia.yml