From d9d8686efb0376bc1dceeb1fbaabd143b5992428 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Mon, 9 Mar 2026 10:52:24 -0400 Subject: [PATCH] Build without rke2 pre-installed --- .gitlab-ci.yml | 154 ++++++++++++++++++------------------- recipes/wke-fw-desktop.yml | 8 +- recipes/wke-server.yml | 6 +- recipes/wke-worker.yml | 6 +- 4 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b9ce1c..5e0c43f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ 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: 'true' BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '128' BB_BUILD_PUSH: 'true' CLICOLOR_FORCE: 1 @@ -40,43 +40,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 +84,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 diff --git a/recipes/wke-fw-desktop.yml b/recipes/wke-fw-desktop.yml index c8589b9..99f75b6 100644 --- a/recipes/wke-fw-desktop.yml +++ b/recipes/wke-fw-desktop.yml @@ -21,8 +21,8 @@ modules: # install: # packages: # - ramalama - - type: script - snippets: - # - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh - - curl -sfL https://get.rke2.io | INSTALL_RKE2_SKIP_RELOAD=true sh + # - type: script + # snippets: + # # - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh + # - curl -sfL https://get.rke2.io | INSTALL_RKE2_SKIP_RELOAD=true sh - from-file: common/post-build.yml diff --git a/recipes/wke-server.yml b/recipes/wke-server.yml index 1c6e900..c31cf00 100644 --- a/recipes/wke-server.yml +++ b/recipes/wke-server.yml @@ -12,7 +12,7 @@ modules: files: - source: rke-server destination: / - - type: script - snippets: - - curl -sfL https://get.rke2.io | INSTALL_RKE2_SKIP_RELOAD=true sh + # - type: script + # snippets: + # - curl -sfL https://get.rke2.io | INSTALL_RKE2_SKIP_RELOAD=true sh - from-file: common/post-build.yml diff --git a/recipes/wke-worker.yml b/recipes/wke-worker.yml index c37d776..70945cf 100644 --- a/recipes/wke-worker.yml +++ b/recipes/wke-worker.yml @@ -8,7 +8,7 @@ alt-tags: - worker modules: - from-file: common/wke.yml - - type: script - snippets: - - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh + # - type: script + # snippets: + # - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh - from-file: common/post-build.yml