From e34ecdd54e9db7ea0cd33f35adf2c7ac9254ac5b Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Sun, 31 Aug 2025 23:15:22 -0400
Subject: [PATCH] Try rechunk again

---
 .gitlab-ci.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 946ff53..79ec8d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,20 +21,14 @@ build-image:
     matrix:
       - RECIPE:
           - cp-laptop.yml
-          - jp-desktop-nvidia.yml
+          # - jp-desktop-nvidia.yml
           - wke-server.yml
           - wke-worker.yml
           - jp-laptop.yml
         TAG: main
-        BB_CACHE_LAYERS: 'true'
-        BB_BUILD_PUSH: 'true'
-      - RECIPE: wke-server.yml
+      - RECIPE: jp-desktop-nvidia.yml
         TAG: 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci
-        BB_BUILD_DRIVER: podman
-        BB_BUILD_SQUASH: 'true'
-        BB_BUILD_RECHUNK:
-          - 'true'
-          - 'false'
+        BB_BUILD_RECHUNK: 'true'
   variables:
     DOCKER_HOST: tcp://docker:2376
     DOCKER_TLS_CERTDIR: /certs
@@ -42,6 +36,8 @@ build-image:
     DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client
     RUST_LOG_STYLE: always
     BB_SIGNING_DRIVER: sigstore
+    BB_CACHE_LAYERS: 'true'
+    BB_BUILD_PUSH: 'true'
     CLICOLOR_FORCE: 1
   before_script:
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash