From ae24df3c7859ec1fc24a44186d7f9d6fee812a2b Mon Sep 17 00:00:00 2001 From: CI Bot Date: Mon, 22 Jun 2026 23:28:39 +0000 Subject: [PATCH 1/5] Bump os-image tgz --- image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index 28fa87f9b..6abb875d4 100644 --- a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,12 +1,12 @@ - f5aa668b4001073ae7cc4470f02993798756ecf51f5cb2c75efdded48fb1979ac702709e45ed01ca4d0361f2175095458d5fdec59e64792169799eeed3fdc795 - bb01b17347b77f28de2758794d9b9c6cfcbd1ce8f9fc4bf855ec013e945240b1 - 7d1b9139bcde2a4cc5bd49d566ef4d00c185fcd4 - bc82513c38a4d4074ee7d5eb93fb2c31 - 435226218 + 7ca6be1910f762add36fa3ca8e59155841102e197eaa3873dd0e8bf9a1482c0b83a499a8db9e3fd2b26986d76cb0bff30fb76bc058dd1a35698990800533d1e5 + e757b7b6a4e1d80ff2da7ac8df472117857c7f20574545b632f38d5f9a0df82c + 33a812490bbeadfb7e79b75e20d8ee5c0c47d597 + 976c3ca90260c8d6d0f23980bc223038 + 435206437 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1111.0.0 + 1112.0.0 8fb4b6e9b9f2469249a8f20ee65a56dbdd663bf7b3eee14e49fefeaa8dc5826c553a9dc81b2af4cb56a1ff29cc18c5cc8610b2ca670ef647fedd4c9645a6db02 @@ -15,8 +15,8 @@ a1ad3da61ce7f95f9ca6a247f554a59d 2177 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1111.0.0 + 1112.0.0 metalink-repository-resource/0.0.0 - 2026-06-21T00:16:18.604878649Z + 2026-06-22T23:28:29.50957337Z From 1c0778fcf0725f5ac07d3f992c048d066d18e7e8 Mon Sep 17 00:00:00 2001 From: aram price Date: Mon, 22 Jun 2026 16:31:00 -0700 Subject: [PATCH 2/5] CI: add flag for ipv6 testing --- ci/pipeline-template.yml | 2 ++ ci/pipeline-vars.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml index 734711b01..0496c9b13 100644 --- a/ci/pipeline-template.yml +++ b/ci/pipeline-template.yml @@ -568,6 +568,7 @@ jobs: timeout: 15m serial: true +#@ if data.values.stemcell_details.test_ipv6: - name: test-stemcells-ipv6 plan: - do: @@ -636,6 +637,7 @@ jobs: attempts: 3 timeout: 15m serial: true +#@ end #@ for iaas in data.values.stemcell_details.include_iaas: - #@ build_stemcell(iaas.iaas, iaas.hypervisor) diff --git a/ci/pipeline-vars.yml b/ci/pipeline-vars.yml index 060c0736a..201e42d78 100644 --- a/ci/pipeline-vars.yml +++ b/ci/pipeline-vars.yml @@ -9,6 +9,7 @@ stemcell_details: os_short_name: jammy subnet_int: "22" #! use last two digits of release year: ex 2010 -> 10 use_efi: false + test_ipv6: true bot_email: infra@cloudfoundry.org bot_name: CI Bot include_iaas: [ From 56028aea6ff004c6db7617da54a2dd1d3a5ec9cc Mon Sep 17 00:00:00 2001 From: aram price Date: Mon, 22 Jun 2026 16:37:44 -0700 Subject: [PATCH 3/5] coderabbit nit fixes https://github.com/cloudfoundry/bosh-linux-stemcell-builder/issues/661 --- ci/pipeline-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml index 0496c9b13..7308b5919 100644 --- a/ci/pipeline-template.yml +++ b/ci/pipeline-template.yml @@ -1469,7 +1469,7 @@ resources: source: bucket: bosh-gce-raw-stemcells-new json_key: ((gcp_json_key)) - regexp: bosh-stemcell-([0-9\.]+)-google-kvm-ubuntu-*-raw.tar.gz + regexp: bosh-stemcell-([0-9.]+)-google-kvm-ubuntu-[a-z]+-raw.tar.gz type: gcs-resource - name: candidate-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @) From 06ddc310e49b4cb369e27fba220c91ce3b093dd2 Mon Sep 17 00:00:00 2001 From: aram price Date: Mon, 22 Jun 2026 16:38:08 -0700 Subject: [PATCH 4/5] coderabbit nit fixes https://github.com/cloudfoundry/bosh-linux-stemcell-builder/issues/662 --- ci/tasks/light-google/make-raw-from-heavy-stemcell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/light-google/make-raw-from-heavy-stemcell.sh b/ci/tasks/light-google/make-raw-from-heavy-stemcell.sh index 0603fc587..357103b1b 100755 --- a/ci/tasks/light-google/make-raw-from-heavy-stemcell.sh +++ b/ci/tasks/light-google/make-raw-from-heavy-stemcell.sh @@ -19,7 +19,7 @@ stemcell_url() { resource="/${STEMCELL_BUCKET_PATH}/${name}" - if [ ! -z "$AWS_ACCESS_KEY_ID" ]; then + if [ ! -z "${AWS_ACCESS_KEY_ID}" ]; then expires=$(date +%s) expires=$((expires + 30)) From 7d91bba7a188725584b6a395af9d7df97cf834c6 Mon Sep 17 00:00:00 2001 From: aram price Date: Mon, 22 Jun 2026 16:51:55 -0700 Subject: [PATCH 5/5] Simplify `groups:` Rename light stemcell `build-` => `create-` --- ci/pipeline-template.yml | 46 +++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml index 7308b5919..fdc00ff46 100644 --- a/ci/pipeline-template.yml +++ b/ci/pipeline-template.yml @@ -160,33 +160,22 @@ params: groups: - name: build jobs: - - build-stemcell - - test-unit - - build-os-image - #@ for iaas in data.values.stemcell_details.include_iaas: - - build-(@= iaas.iaas @)-(@= iaas.hypervisor @) - #@ end - #@ for iaas in data.values.stemcell_details.include_fips_iaas: - - build-(@= iaas.iaas @)-(@= iaas.hypervisor @)-fips - #@ end - bats - - test-stemcells-ipv4 - - test-stemcells-ipv6 + - build-* + - test-unit + - test-stemcells-* - aggregate-candidate-stemcells - name: publish jobs: - - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) - - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) - - publish-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + - create-light-* + - publish-* - name: auto-bumps jobs: - bump-deps - bump-golang-deps - bump-bosh-agent - #@ for blobstore_type in data.values.blobstore_types: - - bump-bosh-blobstore-(@= blobstore_type @) - #@ end + - bump-bosh-blobstore-* - name: automatic-triggers jobs: @@ -194,12 +183,13 @@ groups: - check-usn-packages-are-available - log-low-medium-cves - notify-of-usn + - name: infrastructure-tending jobs: - build-os-image-stemcell-builder - ensure-integration-network - - cleanup-published-aws-light-stemcells-older-than-three-years - - cleanup-unpublished-(@= data.values.stemcell_details.os_name @)-aws-light-stemcells + - cleanup-published-* + - cleanup-unpublished-* #@yaml/text-templated-strings jobs: @@ -1015,7 +1005,8 @@ jobs: - #@ cleanup_unpublished_light_stemcells("us-gov") #!- #@ cleanup_unpublished_light_stemcells("cn") -- name: build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) +- name: create-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + old_name: build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) plan: - get: bosh-stemcells-ci - get: aws-light-stemcell-builder-registry-image @@ -1104,7 +1095,8 @@ jobs: version: us-input-stemcell/.resource/version serial: true -- name: build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) +- name: create-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + old_name: build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) plan: - in_parallel: - get: stemcell @@ -1205,23 +1197,23 @@ jobs: params: skip_download: true passed: - - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) - - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + - create-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + - create-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) resource: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @) - get: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @) passed: - - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) - - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + - create-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + - create-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) #@ if len(data.values.stemcell_details.include_fips_iaas) > 0: - get: candidate-(@= data.values.stemcell_details.os_name @)-fips-stemcell-(@= str(data.values.stemcell_details.major_version) @) #@ end - get: candidate-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @) passed: - - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + - create-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) - get: candidate-aws-light-stemcell resource: candidate-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @) passed: - - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) + - create-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) - file: bosh-stemcells-ci/ci/tasks/build-release-metadata.yml image: os-image-stemcell-builder-registry-image task: build-release-metadata