From 3eefec1d1e066dbe0bf3a283f2fd276742207702 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Sat, 29 Nov 2025 13:21:29 -0500
Subject: [PATCH] Chunk build all the images

---
 .gitlab-ci.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c0b9b9..5ec52ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,8 @@ variables:
   DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client
   RUST_LOG_STYLE: always
   BB_SIGNING_DRIVER: sigstore
-  BB_CACHE_LAYERS: 'true'
   BB_BUILD_PUSH: 'true'
+  BB_BUILD_CHUNKED_OCI: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
 
@@ -42,8 +42,6 @@ base-images:
   extends:
     - .build
   stage: base-images
-  variables:
-    BB_BUILD_RECHUNK: 'true'
   rules:
     # Run when any of the base recipes change
     - changes:
@@ -65,11 +63,8 @@ base-images:
           # - base-cosmic-nvidia.yml
           - base-kinoite.yml
           - base-kinoite-nvidia.yml
-      - RECIPE:
           - base-combo.yml
           - base-combo-nvidia.yml
-        BB_BUILD_CHUNKED_OCI: 'true'
-        BB_BUILD_RECHUNK: 'false'
 
 wke-images:
   extends:
@@ -78,6 +73,8 @@ wke-images:
   needs:
     - job: 'base-images: [base.yml]'
       optional: true
+  variables:
+    BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '256'
   parallel:
     matrix:
       - RECIPE:
@@ -89,6 +86,8 @@ kinoite-images:
   extends:
     - .build
   stage: build
+  variables:
+    BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '256'
   needs:
     - job: 'base-images: [base-kinoite.yml]'
       optional: true
@@ -101,6 +100,8 @@ kinoite-nvidia-images:
   extends:
     - .build
   stage: build
+  variables:
+    BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '256'
   needs:
     - job: 'base-images: [base-kinoite-nvidia.yml]'
       optional: true
@@ -114,9 +115,9 @@ combo-images:
     - .build
   stage: build
   variables:
-    BB_BUILD_CHUNKED_OCI: 'true'
+    BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '256'
   needs:
-    - job: 'base-images: [base-combo.yml, true, false]'
+    - job: 'base-images: [base-combo.yml]'
       optional: true
   parallel:
     matrix:
@@ -128,9 +129,9 @@ combo-nvidia-images:
     - .build
   stage: build
   variables:
-    BB_BUILD_CHUNKED_OCI: 'true'
+    BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '256'
   needs:
-    - job: 'base-images: [base-combo-nvidia.yml, true, false]'
+    - job: 'base-images: [base-combo-nvidia.yml]'
       optional: true
   parallel:
     matrix: