From 002dfd70ec81fe91d1acde28693977592bdcd56e Mon Sep 17 00:00:00 2001 From: Chris Selzo Date: Mon, 20 Apr 2026 20:02:38 -0700 Subject: [PATCH 01/24] Include netplan refactor packages in Azure dpkg list In https://lists.ubuntu.com/archives/jammy-changes/2024-September/033387.html it says: " Packaging restructuring: - Split netplan-generator into separate package to make the Python dependency optional. - Split python3-netplan bindings into a separate package" Newer Azure builds pull in this new netplan version due to cloud-init. It does not seem like there are any functional changes that we care about. ai-assisted=yes [TNZ-88995] --- bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt b/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt index 84d58dbeef..bb143bfbd5 100644 --- a/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt +++ b/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt @@ -7,12 +7,14 @@ linux-cloud-tools-5.15 linux-cloud-tools-5.15-generic linux-cloud-tools-common linux-cloud-tools-generic +netplan-generator netplan.io python-babel-localedata python3-attr python3-babel python3-certifi python3-debconf +python3-netplan python3-pyrsistent:amd64 python3-requests python3-serial From 9658d048eff24cea1c719b43511b50465234cf0f Mon Sep 17 00:00:00 2001 From: Chris Selzo Date: Mon, 20 Apr 2026 20:05:49 -0700 Subject: [PATCH 02/24] Serialize stemcell builds, and remove attempts We don't really ever want these builds to stack up, and I believe the attempts: 3 just lead to longer failure cycles. ai-assisted=yes [TNZ-88995] --- ci/pipelines/builder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipelines/builder.yml b/ci/pipelines/builder.yml index 4107fc9d3a..c13c293866 100644 --- a/ci/pipelines/builder.yml +++ b/ci/pipelines/builder.yml @@ -446,6 +446,7 @@ jobs: #@ def build_stemcell(IAAS, HYPERVISOR, FIPS=""): name: build-(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @) + serial: true plan: - in_parallel: - get: version @@ -468,7 +469,6 @@ jobs: passed: - build-os-image - task: create-stemcell - attempts: 3 file: bosh-stemcells-ci/ci/tasks/build.yml image: os-image-stemcell-builder-registry-image params: From 6501c796a1a33eea0163fef7584f0289b79243d4 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Tue, 21 Apr 2026 03:16:15 +0000 Subject: [PATCH 03/24] Bump os-image tgz --- .../ubuntu-jammy/ubuntu-jammy.meta4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index 77e73934cf..00942e7279 100644 --- a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,12 +1,12 @@ - f14e17b332dd055f71a2261473821f39fdcc5b672948d7610e5a58788ad10f70e1bbb7e7e63bd48208dbfa079a7aa0d9c3f1b5ca135ab9542fe1a3f3ccf6358b - bab0a041fc97a8aef0234a659119461836545a4d9e9aa2902dd60f9dfd51080d - b0a1bcbfee67632084d6fa09eb6718b80a7f2a62 - 2c21ae531a987cf7e30256b5e391a67d - 434821629 + b0a0d3d04f85e78933dcdc05b6051401571ab6c325712dd1040372f8cb41c809f6c341750a81b8fb49256db14b6596ea4cde2e89751e72d05403e3769db79416 + c87a92c68ba3d28a5d712fa4daa2f89845367905ca251f40ecdcd3bcb6270dcf + 576009928ec83fb50ecde648b0150f3efca4a872 + 0c88364f461c3d0f0724160e3d70d952 + 434823785 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1035.0.0 + 1036.0.0 01afb5ed2b39785768aad8539a4909da9c3fc43ae8b50e9d818e10bb4b9124d215f76233a3d60c331d1f33859e52efad73f884fa0dc20a1a8a67deef7f1223b2 @@ -15,8 +15,8 @@ c24d83753c173f32f3907da4573e2e45 63230 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1035.0.0 + 1036.0.0 metalink-repository-resource/0.0.0 - 2026-04-21T00:23:05.447024459Z + 2026-04-21T03:16:04.571956693Z From 80003d47427d91ee18679e62de9b24f7866c5ef0 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Tue, 21 Apr 2026 04:01:46 +0000 Subject: [PATCH 04/24] Bump os-image tgz --- .../ubuntu-jammy/ubuntu-jammy.meta4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index 00942e7279..1750711793 100644 --- a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,12 +1,12 @@ - b0a0d3d04f85e78933dcdc05b6051401571ab6c325712dd1040372f8cb41c809f6c341750a81b8fb49256db14b6596ea4cde2e89751e72d05403e3769db79416 - c87a92c68ba3d28a5d712fa4daa2f89845367905ca251f40ecdcd3bcb6270dcf - 576009928ec83fb50ecde648b0150f3efca4a872 - 0c88364f461c3d0f0724160e3d70d952 - 434823785 + 579f21c09090cb295337eb7a53f9df842001b8698f68805ebbc835abfbbfa86aa9200442f771cf42acc96d5921ecdb44168e2e08cdfb058cccfd205602f465a4 + bfe006538df0881cc863a426e551e08174647258dc1ea54ab049381fae83bbc6 + 68fc167b9cbc6b6e1c425cf43e65f83e2ef96907 + 1e9decd99943ad36b4f2fd3272fbddf6 + 434808001 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1036.0.0 + 1037.0.0 01afb5ed2b39785768aad8539a4909da9c3fc43ae8b50e9d818e10bb4b9124d215f76233a3d60c331d1f33859e52efad73f884fa0dc20a1a8a67deef7f1223b2 @@ -15,8 +15,8 @@ c24d83753c173f32f3907da4573e2e45 63230 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1036.0.0 + 1037.0.0 metalink-repository-resource/0.0.0 - 2026-04-21T03:16:04.571956693Z + 2026-04-21T04:01:32.096074036Z From 2c1203c805c804a797da098903b3548112e51c24 Mon Sep 17 00:00:00 2001 From: aram price Date: Tue, 21 Apr 2026 11:27:32 -0700 Subject: [PATCH 05/24] README: update subnet instructions --- README.md | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 3f2a97aa5e..33096dc568 100644 --- a/README.md +++ b/README.md @@ -296,19 +296,21 @@ Concourse publishes its artifacts to GCS. #### Create Buckets ```shell -gsutil mb -l europe-west4 gs://bosh-aws-light-stemcells -gsutil mb -l europe-west4 gs://bosh-aws-light-stemcells-candidate +export gcp_region="europe-west4" -gsutil mb -l europe-west4 gs://bosh-gce-light-stemcell-ci-terraform-state +gsutil mb -l "${gcp_region}" gs://bosh-aws-light-stemcells +gsutil mb -l "${gcp_region}" gs://bosh-aws-light-stemcells-candidate -gsutil mb -l europe-west4 gs://bosh-gce-light-stemcells -gsutil mb -l europe-west4 gs://bosh-gce-light-stemcells-candidate -gsutil mb -l europe-west4 gs://bosh-gce-raw-stemcells-new +gsutil mb -l "${gcp_region}" gs://bosh-gce-light-stemcell-ci-terraform-state -gsutil mb -l europe-west4 gs://bosh-core-stemcells -gsutil mb -l europe-west4 gs://bosh-core-stemcells-candidate -gsutil mb -l europe-west4 gs://bosh-os-images -gsutil mb -l europe-west4 gs://bosh-stemcell-triggers +gsutil mb -l "${gcp_region}" gs://bosh-gce-light-stemcells +gsutil mb -l "${gcp_region}" gs://bosh-gce-light-stemcells-candidate +gsutil mb -l "${gcp_region}" gs://bosh-gce-raw-stemcells-new + +gsutil mb -l "${gcp_region}" gs://bosh-core-stemcells +gsutil mb -l "${gcp_region}" gs://bosh-core-stemcells-candidate +gsutil mb -l "${gcp_region}" gs://bosh-os-images +gsutil mb -l "${gcp_region}" gs://bosh-stemcell-triggers ``` #### Make Buckets Publicly Readable @@ -343,18 +345,28 @@ gcloud compute firewall-rules update default-allow-internal --source-ranges 10.0 #### Create Integration Networks -Create the bosh-integration networks for tests and BATs tests. Each stemcell -line should get its own subnet corresponding to its `subnet_int`. +Create a `stemcell-builder-integration-${subnet_int}` subnetworks need by BATs tests. +Each stemcell line should get its own subnet corresponding to its `subnet_int` equal to +the two digit release year. For example release year 2010 would have `subnet_int="10"`. -Example: +Example per [ci/pipelines/vars.yml](ci/pipelines/vars.yml): -- subnet_id=44 - - subnet_range=10.100.44.0/24 - - subnet_name=bosh-integration-44 +```yaml +--- +stemcell_details: + # ... snip + subnet_int: "10" #! use last two digits of release year: ex 2010 -> 10 + # ... snip +``` + +Would mean creating the following subnet in GCP: ```shell # branch: ubuntu-${short_name} -gcloud compute networks subnets create --network default --range 10.100.0.0/24 bosh-integration-0 +export subnet_int="10" + +gcloud compute networks subnets create --network default \ + --range "10.100.${subnet_int}.0/24" "stemcell-builder-integration-${subnet_int}" ``` ### AWS From f33109e9a3673d008b577e028f9208861c4a523b Mon Sep 17 00:00:00 2001 From: CI Bot Date: Tue, 21 Apr 2026 22:56:07 +0000 Subject: [PATCH 06/24] Bump os-image tgz --- .../ubuntu-jammy/ubuntu-jammy.meta4 | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index 1750711793..9e88a50aba 100644 --- a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,22 +1,22 @@ - 579f21c09090cb295337eb7a53f9df842001b8698f68805ebbc835abfbbfa86aa9200442f771cf42acc96d5921ecdb44168e2e08cdfb058cccfd205602f465a4 - bfe006538df0881cc863a426e551e08174647258dc1ea54ab049381fae83bbc6 - 68fc167b9cbc6b6e1c425cf43e65f83e2ef96907 - 1e9decd99943ad36b4f2fd3272fbddf6 - 434808001 + 6c6ba8038dbce15c1802c3fe4dd4d497d524627d2cf25298e5c1f41803ae80bc0367710d9896cf1f02a5e84bfa191e241e8f4407dc841b45ea0c2413ccfa1373 + ca5c1c04b11f2925fda5c9116217986ca99ef3ae60f71b5f53e2a9499da81737 + b19cbb93c625bee5300199c47e69997a1502b11a + 3cd37c07cd2b8ec3aaa392147423653b + 434777895 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1037.0.0 + 1038.0.0 - 01afb5ed2b39785768aad8539a4909da9c3fc43ae8b50e9d818e10bb4b9124d215f76233a3d60c331d1f33859e52efad73f884fa0dc20a1a8a67deef7f1223b2 - 382c31fe95e72e17c47cb2f182a3dc220b182b3f0bfec1d72fd3ecdbdbda0dc4 - dd13ab55bd03523ddeb36dc95eebcecf6b3c8191 - c24d83753c173f32f3907da4573e2e45 - 63230 + be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09 + 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b + adc83b19e793491b1c6ea0fd8b46cd9f32e592fc + 68b329da9893e34099c7d8ad5cb9c940 + 1 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1037.0.0 + 1038.0.0 metalink-repository-resource/0.0.0 - 2026-04-21T04:01:32.096074036Z + 2026-04-21T22:55:56.576225928Z From ddeea5100b815456edf81f75bb7dca6e4d94309d Mon Sep 17 00:00:00 2001 From: CI Bot Date: Wed, 22 Apr 2026 00:00:20 +0000 Subject: [PATCH 07/24] bump bosh-agent/2.839.0 --- .../bosh_go_agent/assets/bosh-agent-version | 2 +- .../bosh_go_agent/assets/metalink.meta4 | 66 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version b/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version index 0089b5bb4d..e7729a5e25 100644 --- a/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version +++ b/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version @@ -1 +1 @@ -2.838.0 \ No newline at end of file +2.839.0 \ No newline at end of file diff --git a/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 b/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 index 979aff7842..797b7ea7fb 100644 --- a/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 +++ b/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 @@ -1,49 +1,49 @@ - - c61a18fc5629714b011acadb31e599ccd5bef89294a07bbc3eed2f15ec5864900572e7e392851184e847090d9b257a2cd91c76d11a9d66dd78d5af0afbf3894a - d5fcd1251ecf32ec92e2b2830510230c40a3984c9ce3a96c609ba0ec971642a9 - e134fff43a8a164d2527c99b630d1b9594f1e163 - ad60f9e50a86b0424f7e635e30745b4c - 22078960 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.838.0-linux-amd64 - 2.838.0 + + 0d5f25a377807319a7d60595879fedb895c338063bfe8622d5b89dd4f7c39d8b451b7096c467a39b00ac5f619c9a6bb72b5eb541a5e79ce06f58db1ce1f2718d + 8e116d77cd9d9e02879c78530c640405d0e9c04c943a7fec5321af9f3ba1ad31 + 7bf47c55369bcc1d891d52b9b3ed75cc5ecca873 + 148f1ebe8a76a1d98b5f3067ce7989d7 + 22083921 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.839.0-linux-amd64 + 2.839.0 - - 8e00303524f90a490d4e1f60a0b4cd57802554a3529797c36b936947c9013b1d63c3754eca6e907edb53f538c19b498c4264525869a3818b3d8ccbe5ed0674c8 - f8645bbf8f6cf22a6fa915f4ad649d12acdc9e346a269465cc9a5bfb438f025c - 464ec916e63bfa40010870e0fafeef182f995637 - 86de908a042aaa3b4d8665fb1149247a + + b111627ff081dc0bf85622320f99fdc5af6c8c2d2b5f88fe36bd44775483901bf44fcf9e906c26285fbc8b935ccdabb339648317b328712eb1fe943b04684ab1 + ef5f70bdec76723206d693a1b46ab8113fce5e26a9aa8f9a39158633154a025c + 7b7fbb7186d496b6219df04b00bd078bb7acb330 + fd8e3dfcbd86deb94fb16cea2b0c1adb 21929984 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.838.0-windows-amd64.exe - 2.838.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.839.0-windows-amd64.exe + 2.839.0 - - 4c06732f4c05f5d2805585b453bb5c7a3daccae97dc41834771962f1f3e1ff4519d49a8b011b3c787fc230e62d534a24e41ec7f3bcc5d2138f850fd402d1a9bd - 9b66e0f33be0688d1eac311407ce2ae3035ee8b935932b979b4ec256f6cb119d - 026708275a35ca1fe513e8e1f9fb1993cb859700 - b2768b2722bd5f1ea54a93e46e0fa214 + + 7a6f2729ca2f2f8f1985172f72e222ba4167b8b96c7b3db4a534bc920ddeaab21d4bb653c1191d8c3df9686fa26fdd8d3dca4692b4645beecc9290f0d0f3a1cc + efdd740c5acc2ca4772760820449700b0a3dc572ce0f8763378b7e9e0c6e0a06 + 99944201690f8ed27e3e7043462b0f43bb201011 + 1bc2b33cc3d2014f514971757ae9a345 9016320 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-pipe-2.838.0-windows-amd64.exe - 2.838.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-pipe-2.839.0-windows-amd64.exe + 2.839.0 - - 63b76a92666d2721fe50233289677e787e61d4c236ecedf7006b9c481c317b81de7cd96844130a94f5208b026b6629a816d5e74721b7be964cbde4f33e8b8236 - 15149cc9720c45ebdf23b64dc5aa8e7647d7474f452ce99744e661bb6952ca5c - 5dcaa12dae871a34deca8ec88c18f3f64e50f3eb - d814b81e3b2f90448502697ba434bf35 + + 78cd73b54a4bd7dcc854262d8ae0bfbb97ce1e67241cc3958c7489d64f98e5ed01a6a8daa93049e69b27edb26f58ec177e147655ca083c7d0f4753fc3db78398 + 103523b05e8a3889126e948d07ef7dd935ea26ab7a6189c2211ea8dd8135858f + 3970b616a92d8bff0f795fb7239d1671d18a0cb0 + f3adb29232cb146d4711007fc956649b 9 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/git-sha-2.838.0 - 2.838.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/git-sha-2.839.0 + 2.839.0 - + fe22cd6fd90ded459b08385497032f2de4022f712dc753dc026ffbc024d3cdd5007f68886f0d4dd8a7832ece138455c3320ce65b72eec054ed3717f6212a7567 a1f4729600504b0cc026ff5e826bb403b43a564780e091d01e0ab7bacb15906a a5a1e59f6bfaa23bffb85a6647bfbc3df1dbf594 c0e9e8c1a9510c750742534ba431530b 708 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/service_wrapper-2.838.0.xml - 2.838.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/service_wrapper-2.839.0.xml + 2.839.0 metalink-repository-resource/0.0.0 - 2026-04-20T20:13:41.488146813Z + 2026-04-20T21:26:24.929794183Z From 313ca02cfd88ab758aeb123dd6074bbb8e82ff4c Mon Sep 17 00:00:00 2001 From: CI Bot Date: Wed, 22 Apr 2026 00:28:45 +0000 Subject: [PATCH 08/24] Bump os-image tgz --- .../ubuntu-jammy/ubuntu-jammy.meta4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index 9e88a50aba..7bec5ec831 100644 --- a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,12 +1,12 @@ - 6c6ba8038dbce15c1802c3fe4dd4d497d524627d2cf25298e5c1f41803ae80bc0367710d9896cf1f02a5e84bfa191e241e8f4407dc841b45ea0c2413ccfa1373 - ca5c1c04b11f2925fda5c9116217986ca99ef3ae60f71b5f53e2a9499da81737 - b19cbb93c625bee5300199c47e69997a1502b11a - 3cd37c07cd2b8ec3aaa392147423653b - 434777895 + a3b1488a13feceea71ad9c1ff361c8580bae2b0c29650bf673d27f7505ff80bfbb070b4ff3e369eae7bebff944b3e8c8d78783f04a1c8995f41ef39fe5a5148a + 13ea140fe3094f0d8f7652c6e69a972d53dc55c7834d041c0d4b5eca837ed806 + 295bd8d9081c81d60a0bfe3ebe4b2058540195d3 + 20cbf7523e9338867bc6fd61c6f8264a + 434765393 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1038.0.0 + 1039.0.0 be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09 @@ -15,8 +15,8 @@ 68b329da9893e34099c7d8ad5cb9c940 1 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1038.0.0 + 1039.0.0 metalink-repository-resource/0.0.0 - 2026-04-21T22:55:56.576225928Z + 2026-04-22T00:28:32.746060589Z From 2238b91fc40be36914e93549d369c384c2baf579 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Wed, 22 Apr 2026 01:14:44 +0000 Subject: [PATCH 09/24] bump bosh-agent/2.840.0 --- .../bosh_go_agent/assets/bosh-agent-version | 2 +- .../bosh_go_agent/assets/metalink.meta4 | 66 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version b/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version index e7729a5e25..e0911a6b1d 100644 --- a/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version +++ b/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version @@ -1 +1 @@ -2.839.0 \ No newline at end of file +2.840.0 \ No newline at end of file diff --git a/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 b/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 index 797b7ea7fb..c0576b8865 100644 --- a/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 +++ b/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 @@ -1,49 +1,49 @@ - - 0d5f25a377807319a7d60595879fedb895c338063bfe8622d5b89dd4f7c39d8b451b7096c467a39b00ac5f619c9a6bb72b5eb541a5e79ce06f58db1ce1f2718d - 8e116d77cd9d9e02879c78530c640405d0e9c04c943a7fec5321af9f3ba1ad31 - 7bf47c55369bcc1d891d52b9b3ed75cc5ecca873 - 148f1ebe8a76a1d98b5f3067ce7989d7 - 22083921 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.839.0-linux-amd64 - 2.839.0 + + 9212b762c80b01f4b651004acd02bf1a0e82f0da9dd3ddd2921dae483dfa2fc64ca8c97c0c29eef4332c43df145e17ff292c8dd824cac34aa852e562ecf630a1 + 16fdc9e1eb29961de22857677faaaad3fb619066ed43ea930bc3715aa539cf50 + e1dff35994a0b61ad29dcf0d356232675a081afd + 4c2ae315a5dcdc48a8c56ce792ec6792 + 22084195 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.840.0-linux-amd64 + 2.840.0 - - b111627ff081dc0bf85622320f99fdc5af6c8c2d2b5f88fe36bd44775483901bf44fcf9e906c26285fbc8b935ccdabb339648317b328712eb1fe943b04684ab1 - ef5f70bdec76723206d693a1b46ab8113fce5e26a9aa8f9a39158633154a025c - 7b7fbb7186d496b6219df04b00bd078bb7acb330 - fd8e3dfcbd86deb94fb16cea2b0c1adb + + d8ab4abc15f05cd8b50414cc0a398d7dfc710b86f51dce94cc97871bd155d716d8d53a323dbb2b06b7e56f378339512e043e5be60a53999b88e04f7d19470d9d + 255d6e1dd44f8bee8951c2589095495f6db2194fd7a0a1165b12511838bf68c5 + 6d82afe32ab1c9df7e3f48cdc2ed4bcf75eff354 + dc0e6f313efa981bbe29dba2f49a5f12 21929984 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.839.0-windows-amd64.exe - 2.839.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.840.0-windows-amd64.exe + 2.840.0 - - 7a6f2729ca2f2f8f1985172f72e222ba4167b8b96c7b3db4a534bc920ddeaab21d4bb653c1191d8c3df9686fa26fdd8d3dca4692b4645beecc9290f0d0f3a1cc - efdd740c5acc2ca4772760820449700b0a3dc572ce0f8763378b7e9e0c6e0a06 - 99944201690f8ed27e3e7043462b0f43bb201011 - 1bc2b33cc3d2014f514971757ae9a345 + + a91ec9890b4b1d42e4e5a0ab40e249f2912674717ef107bce677791f9de08b57228266071251e367e37346cd683e7185d635227537b1da3639c14f19c1b48713 + 3e9e1b407ed74fc491cedb21a441dcb7409e365499e16b8e5cbc12c70832993b + 76fb4cd3c2181b3be7a94e36f47214519cbc5865 + 1ae6c7d42e0c0aa9583dac5bbe6a2bea 9016320 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-pipe-2.839.0-windows-amd64.exe - 2.839.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-pipe-2.840.0-windows-amd64.exe + 2.840.0 - - 78cd73b54a4bd7dcc854262d8ae0bfbb97ce1e67241cc3958c7489d64f98e5ed01a6a8daa93049e69b27edb26f58ec177e147655ca083c7d0f4753fc3db78398 - 103523b05e8a3889126e948d07ef7dd935ea26ab7a6189c2211ea8dd8135858f - 3970b616a92d8bff0f795fb7239d1671d18a0cb0 - f3adb29232cb146d4711007fc956649b + + f4e65975690d74967c3b69942337b656de192f67c618ec050a4292942921f1e048cb39c5a43dcd6e1c06428e380ed12698870dfa9409151e6735bd3942dc6f68 + 2d970166629682447c16de901f0f0ec6f2c4f1af840c66dee4dc654ea941ee07 + f57ba0f26efcb58c13bac0e6e8f6d96fe9b656b6 + 4a6e616704de16076b6ad78d2d0fb1bf 9 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/git-sha-2.839.0 - 2.839.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/git-sha-2.840.0 + 2.840.0 - + fe22cd6fd90ded459b08385497032f2de4022f712dc753dc026ffbc024d3cdd5007f68886f0d4dd8a7832ece138455c3320ce65b72eec054ed3717f6212a7567 a1f4729600504b0cc026ff5e826bb403b43a564780e091d01e0ab7bacb15906a a5a1e59f6bfaa23bffb85a6647bfbc3df1dbf594 c0e9e8c1a9510c750742534ba431530b 708 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/service_wrapper-2.839.0.xml - 2.839.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/service_wrapper-2.840.0.xml + 2.840.0 metalink-repository-resource/0.0.0 - 2026-04-20T21:26:24.929794183Z + 2026-04-21T23:57:49.845860769Z From 2c32b2ce1cf3d4cd2d9418b3dcc77b8bd4d91ff9 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Wed, 22 Apr 2026 01:41:04 +0000 Subject: [PATCH 10/24] Bump os-image tgz --- .../ubuntu-jammy/ubuntu-jammy.meta4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index 7bec5ec831..f8acce0aaf 100644 --- a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,12 +1,12 @@ - a3b1488a13feceea71ad9c1ff361c8580bae2b0c29650bf673d27f7505ff80bfbb070b4ff3e369eae7bebff944b3e8c8d78783f04a1c8995f41ef39fe5a5148a - 13ea140fe3094f0d8f7652c6e69a972d53dc55c7834d041c0d4b5eca837ed806 - 295bd8d9081c81d60a0bfe3ebe4b2058540195d3 - 20cbf7523e9338867bc6fd61c6f8264a - 434765393 + 2d7d01bd431355031979ccedad723797f2ddd51df1cd0d9ec49c66d687169534f16accd1cbe4d3646f15ccf11f38b1ee49c2f70095fe12a2c8466c7d094e72e7 + 9ff406bcfcd7082dbc0b0256ae4d99f0b3833e0df0e8e15365e772d2eda6a477 + 3928c696a457e154530f55a3e6947b1a72be3a51 + c1da9cdcd7bfa075b0fc4b1d635d1a05 + 434765586 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1039.0.0 + 1040.0.0 be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09 @@ -15,8 +15,8 @@ 68b329da9893e34099c7d8ad5cb9c940 1 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1039.0.0 + 1040.0.0 metalink-repository-resource/0.0.0 - 2026-04-22T00:28:32.746060589Z + 2026-04-22T01:40:54.005556439Z From 5c6f3a567e0571e5ec50dc47e9a31b1407fce0cf Mon Sep 17 00:00:00 2001 From: Matthew Kocher Date: Thu, 16 Apr 2026 16:38:54 -0700 Subject: [PATCH 11/24] fix cgroupsv1 support in warden The new error checking was finding errors. Going back to the old code which did not check for errors but did work for teams. Jammy-on-Jammy -on-Garden is a pretty niche use case these days, so this seems ok. --- .../bosh_monit/assets/monit-access-helper.sh | 25 ++++++++++++------- .../assets/restrict-monit-api-access | 2 +- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh b/stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh index ea8f8313bb..be95cfa3a8 100644 --- a/stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh +++ b/stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh @@ -12,8 +12,20 @@ monit_isolation_classid=2958295041 +# True when /sys/fs/cgroup is the root of a cgroup2 mount (unified hierarchy). +# Do not use /proc/self/cgroup's "0::" entry alone: under systemd hybrid mode a +# 0:: line can refer to the small cgroup2 tracking hierarchy while resource +# controllers (including net_cls) remain on cgroup v1. +# +# Prefer cgroup.controllers; also accept stat(2) filesystem type for hosts where +# the file is missing from the mount view but the root is still cgroup2fs. +monit_using_unified_cgroup_v2() { + [ -f /sys/fs/cgroup/cgroup.controllers ] && return 0 + [ "$(stat -fc %T /sys/fs/cgroup 2>/dev/null)" = "cgroup2fs" ] +} + permit_monit_access() { - if grep -q '^0::' /proc/self/cgroup 2>/dev/null; then + if monit_using_unified_cgroup_v2; then # cgroupv2 (unified hierarchy) # Create a sub-cgroup under the current process's cgroup and move into it. # The iptables rules match on this cgroup path. @@ -28,15 +40,10 @@ permit_monit_access() { mkdir -p "${monit_access_cgroup}" echo $$ > "${monit_access_cgroup}/cgroup.procs" else - # cgroupv1 - use net_cls classid - net_cls_location="$(cat /proc/self/mounts | grep ^cgroup | grep net_cls | awk '{ print $2 }')" - net_cls_subproc="$(grep net_cls /proc/self/cgroup | awk -F ":" '{ print $3 }')" - if [ -z "${net_cls_location}" ] || [ -z "${net_cls_subproc}" ]; then - echo "permit_monit_access: unable to resolve cgroup v1 net_cls location or path" >&2 - return 1 - fi + # this seems to work in docker but net_cls_location is empty in garden + net_cls_location="$(cat /proc/self/mounts | grep ^cgroup | grep net_cls | awk '{ print $2 }' )" + net_cls_subproc="$(grep net_cls /proc/self/cgroup | awk -F ":" '{ print $3 }' )" monit_access_cgroup="${net_cls_location}/${net_cls_subproc}/monit-api-access" - mkdir -p "${monit_access_cgroup}" echo "${monit_isolation_classid}" > "${monit_access_cgroup}/net_cls.classid" echo $$ > "${monit_access_cgroup}/tasks" diff --git a/stemcell_builder/stages/bosh_monit/assets/restrict-monit-api-access b/stemcell_builder/stages/bosh_monit/assets/restrict-monit-api-access index d1a00fbc23..a6a3add87d 100644 --- a/stemcell_builder/stages/bosh_monit/assets/restrict-monit-api-access +++ b/stemcell_builder/stages/bosh_monit/assets/restrict-monit-api-access @@ -2,7 +2,7 @@ source /var/vcap/bosh/etc/monit-access-helper.sh -if grep -q '^0::' /proc/self/cgroup 2>/dev/null; then +if monit_using_unified_cgroup_v2; then # cgroupv2: dynamically determine the cgroup path for this process. # The agent calls permit_monit_access() to join the monit-api-access sub-cgroup. current_cgroup="$(grep '^0::' /proc/self/cgroup | cut -d: -f3)" From 435d61fe6ea724a03fd2d8767e7d32f70dc1a271 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Wed, 22 Apr 2026 17:38:50 +0000 Subject: [PATCH 12/24] Bump os-image tgz --- .../ubuntu-jammy/ubuntu-jammy.meta4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index f8acce0aaf..670032c4db 100644 --- a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,12 +1,12 @@ - 2d7d01bd431355031979ccedad723797f2ddd51df1cd0d9ec49c66d687169534f16accd1cbe4d3646f15ccf11f38b1ee49c2f70095fe12a2c8466c7d094e72e7 - 9ff406bcfcd7082dbc0b0256ae4d99f0b3833e0df0e8e15365e772d2eda6a477 - 3928c696a457e154530f55a3e6947b1a72be3a51 - c1da9cdcd7bfa075b0fc4b1d635d1a05 - 434765586 + cba5919311c3477a7bd7996dd3d87942887cffcf29e9d3de1263b1ff2296664f894d68647140f6f15d91496eb78151dd9144b21f3ed9332fefbbad644991fe31 + 684baba45d299e1172b7ee2a9f64f8f526a2b9d3c2d8937e7ef9a3cf1f9548aa + bb57f2c81b7dcf930981754622edc410d55f1d2c + a579881ca1a991e3ef8747a9a0fd172a + 434771312 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1040.0.0 + 1041.0.0 be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09 @@ -15,8 +15,8 @@ 68b329da9893e34099c7d8ad5cb9c940 1 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1040.0.0 + 1041.0.0 metalink-repository-resource/0.0.0 - 2026-04-22T01:40:54.005556439Z + 2026-04-22T17:38:36.104193201Z From 5a097c8d4945fcfec7c2b7f49f528ee2ce769a1b Mon Sep 17 00:00:00 2001 From: aram price Date: Thu, 23 Apr 2026 13:34:19 -0700 Subject: [PATCH 13/24] Add PR template --- .github/pull_request_template.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000000..67fcc0ef7b --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,9 @@ +NOTE: this repository uses a "Merge Forward" strategy + +Changes should be made in the earliest applicable branch, and +merged forward through subsequent branches. +1. Create a PR into the oldest branch (`ubuntu-`) +2. After this PR has been merged create a `merge-to-` branch +3. Merge `ubuntu-` into `merge-to-` +4. Create a PR to merge `merge-to-` into `ubuntu-` +5. Repeat as needed for subsequent branches From d4ec66393a03e8fb6e0a3074b65803908ab76b24 Mon Sep 17 00:00:00 2001 From: aram price Date: Thu, 23 Apr 2026 22:38:26 +0200 Subject: [PATCH 14/24] Update .github/pull_request_template.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 67fcc0ef7b..4f5dd8485e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,7 +3,7 @@ NOTE: this repository uses a "Merge Forward" strategy Changes should be made in the earliest applicable branch, and merged forward through subsequent branches. 1. Create a PR into the oldest branch (`ubuntu-`) -2. After this PR has been merged create a `merge-to-` branch +2. After this PR has been merged, create a `merge-to-` branch 3. Merge `ubuntu-` into `merge-to-` 4. Create a PR to merge `merge-to-` into `ubuntu-` 5. Repeat as needed for subsequent branches From 98df527e1b02ff504fcadf012883410847847d63 Mon Sep 17 00:00:00 2001 From: aram price Date: Thu, 23 Apr 2026 22:38:44 +0200 Subject: [PATCH 15/24] Update .github/pull_request_template.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/pull_request_template.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 4f5dd8485e..a2e4fb33c9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,8 +2,8 @@ NOTE: this repository uses a "Merge Forward" strategy Changes should be made in the earliest applicable branch, and merged forward through subsequent branches. -1. Create a PR into the oldest branch (`ubuntu-`) -2. After this PR has been merged, create a `merge-to-` branch -3. Merge `ubuntu-` into `merge-to-` -4. Create a PR to merge `merge-to-` into `ubuntu-` +1. Create a PR into the oldest branch (`ubuntu-`) +2. After this PR has been merged create a `merge-to-` branch +3. Merge `ubuntu-` into `merge-to-` +4. Create a PR to merge `merge-to-` into `ubuntu-` 5. Repeat as needed for subsequent branches From f6ae05e2df20424ff5bbdbdfbf47e84c2183ad1c Mon Sep 17 00:00:00 2001 From: CI Bot Date: Thu, 23 Apr 2026 21:33:06 +0000 Subject: [PATCH 16/24] Bump os-image tgz --- .../ubuntu-jammy/ubuntu-jammy.meta4 | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index 670032c4db..b66c4ab0fa 100644 --- a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,22 +1,22 @@ - cba5919311c3477a7bd7996dd3d87942887cffcf29e9d3de1263b1ff2296664f894d68647140f6f15d91496eb78151dd9144b21f3ed9332fefbbad644991fe31 - 684baba45d299e1172b7ee2a9f64f8f526a2b9d3c2d8937e7ef9a3cf1f9548aa - bb57f2c81b7dcf930981754622edc410d55f1d2c - a579881ca1a991e3ef8747a9a0fd172a - 434771312 + f26ed53e0b9546536501b81ebfdc1c3a647e3bb09bb535befdbd7578730a035ff05b0ac9ad6beb006b79e62621fe3977b0e41a6e1d2b0c351850036412036c1a + 7d926be2ae1703a5c822cabc926a2881b6edd7b20ff79f3b5df379750588ee93 + 14e884acc5ca1dddb5a702e86c526684604f6db0 + 2be15d67a427c45e34c4e4892334d208 + 434787979 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1041.0.0 + 1042.0.0 - be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09 - 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - adc83b19e793491b1c6ea0fd8b46cd9f32e592fc - 68b329da9893e34099c7d8ad5cb9c940 - 1 + ca3e99837fae81c10f5522a623fab715b1e430f7895b1f202bae32ccfe3a6f80ad79cffcbd789adcf099de7b00f7cc8c31ebbb3aeb5c0e13aa7decea88bc1559 + d12b345d3cf6c8127c05e8f702efd18966bf59378830efc14cef784a5248a88e + ade2522e3d639fff8df5117dea1870b605ed52a6 + 6c72c53f5bb8d8d05dd9b377f3beb937 + 869 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1041.0.0 + 1042.0.0 metalink-repository-resource/0.0.0 - 2026-04-22T17:38:36.104193201Z + 2026-04-23T21:32:55.236350743Z From 728363fcfdaffc5ed2e4513cebf3141a881ea774 Mon Sep 17 00:00:00 2001 From: aram price Date: Fri, 24 Apr 2026 11:57:07 -0700 Subject: [PATCH 17/24] CI: stop defaultling `AGENT_SUFFIX` - set explicitly in pipeline config --- ci/pipelines/builder.yml | 12 ++++++------ ci/pipelines/vars.yml | 1 + ci/tasks/build.sh | 1 - ci/tasks/build.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/pipelines/builder.yml b/ci/pipelines/builder.yml index c13c293866..a83aaa0aeb 100644 --- a/ci/pipelines/builder.yml +++ b/ci/pipelines/builder.yml @@ -480,7 +480,7 @@ jobs: STEMCELL_BUCKET: bosh-core-stemcells-candidate(@= FIPS @) GIT_USER_EMAIL: *ci_bot_email GIT_USER_NAME: *ci_bot_name - #! AGENT_SUFFIX: "" + AGENT_SUFFIX: (@= data.values.stemcell_details.agent_suffix @) #@ if/end FIPS != "": UBUNTU_ADVANTAGE_TOKEN: ((ubuntu_advantage_token)) privileged: true @@ -492,7 +492,7 @@ jobs: params: files: - stemcell/*.tgz - rename: "{{.Version}}/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)-go_agent.meta4" + rename: "{{.Version}}/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)(@= data.values.stemcell_details.agent_suffix @).meta4" options: author_email: *ci_bot_email author_name: *ci_bot_name @@ -577,7 +577,7 @@ jobs: file: bosh-stemcells-ci/ci/tasks/bats/iaas/gcp/prepare-bats-config.yml image: bosh-integration-image params: - VARS_STEMCELL_NAME: bosh-google-kvm-ubuntu-(@= data.values.stemcell_details.os_short_name @)-go_agent + VARS_STEMCELL_NAME: bosh-google-kvm-ubuntu-(@= data.values.stemcell_details.os_short_name @)(@= data.values.stemcell_details.agent_suffix @) VARS_NETWORK_DEFAULT: bosh-concourse VARS_AVAILABILITY_ZONE: europe-north2-a VARS_MACHINE_TYPE: e2-standard-2 @@ -641,7 +641,7 @@ jobs: COMMIT_PREFIX: candidate COPY_KEYS: #@ for iaas in data.values.stemcell_details.include_fips_iaas: - - (@= iaas.iaas @)/bosh-stemcell-%s-(@= iaas.iaas @)-(@= iaas.hypervisor @)-(@= data.values.stemcell_details.os_name @)-fips-go_agent.tgz + - (@= iaas.iaas @)/bosh-stemcell-%s-(@= iaas.iaas @)-(@= iaas.hypervisor @)-(@= data.values.stemcell_details.os_name @)-fips(@= data.values.stemcell_details.agent_suffix @).tgz #@ end FROM_BUCKET_NAME: bosh-core-stemcells-candidate-fips FROM_INDEX: dev @@ -663,7 +663,7 @@ jobs: COMMIT_PREFIX: candidate COPY_KEYS: #@ for iaas in data.values.stemcell_details.include_iaas: - - (@= iaas.iaas @)/bosh-stemcell-%s-(@= iaas.iaas @)-(@= iaas.hypervisor @)-(@= data.values.stemcell_details.os_name @)-go_agent.tgz + - (@= iaas.iaas @)/bosh-stemcell-%s-(@= iaas.iaas @)-(@= iaas.hypervisor @)-(@= data.values.stemcell_details.os_name @)(@= data.values.stemcell_details.agent_suffix @).tgz #@ end FROM_BUCKET_NAME: bosh-core-stemcells-candidate FROM_INDEX: dev @@ -916,7 +916,7 @@ resources: options: private_key: ((github_deploy_key_bosh-io-stemcells-core-index.private_key)) filters: - - repositorypath: "*/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)-go_agent.meta4" + - repositorypath: "*/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)(@= data.values.stemcell_details.agent_suffix @).meta4" uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//dev/(@= data.values.stemcell_details.os_name @)(@= FIPS @)/ url_handlers: - include: diff --git a/ci/pipelines/vars.yml b/ci/pipelines/vars.yml index 329f2e54e1..69edefef25 100644 --- a/ci/pipelines/vars.yml +++ b/ci/pipelines/vars.yml @@ -1,6 +1,7 @@ #@data/values --- stemcell_details: + agent_suffix: "-go_agent" branch: ubuntu-jammy major_version: 1 os_version: "22.04" diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh index e14dc284e0..4bc5a6a266 100755 --- a/ci/tasks/build.sh +++ b/ci/tasks/build.sh @@ -23,7 +23,6 @@ check_param IAAS check_param HYPERVISOR check_param OS_NAME check_param OS_VERSION -AGENT_SUFFIX="${AGENT_SUFFIX--go_agent}" export CANDIDATE_BUILD_NUMBER=$( cat "${REPO_PARENT}/version/number" | sed 's/\.0$//;s/\.0$//' ) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index a2b41690c4..2aa0f095ac 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -27,6 +27,6 @@ params: STEMCELL_BUCKET: replace-me S3_API_ENDPOINT: s3.amazonaws.com ESM_TOKEN: - AGENT_SUFFIX: -go_agent + AGENT_SUFFIX: GIT_USER_EMAIL: GIT_USER_NAME: From 66a355d74b507512d942728b7c67d224df3f1abb Mon Sep 17 00:00:00 2001 From: aram price Date: Fri, 24 Apr 2026 11:57:42 -0700 Subject: [PATCH 18/24] Shell: style nit `${foo}` over `$foo` --- ci/tasks/build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh index 4bc5a6a266..0b169ee9bd 100755 --- a/ci/tasks/build.sh +++ b/ci/tasks/build.sh @@ -87,11 +87,11 @@ set -e cd "${REPO_PARENT}/bosh-linux-stemcell-builder" bundle install -if [[ -z "$OS_IMAGE" ]]; then - bundle exec rake stemcell:build[$IAAS,$HYPERVISOR,$OS_NAME,$OS_VERSION,$CANDIDATE_BUILD_NUMBER] +if [[ -z "${OS_IMAGE}" ]]; then + bundle exec rake stemcell:build[${IAAS},${HYPERVISOR},${OS_NAME},${OS_VERSION},${CANDIDATE_BUILD_NUMBER}] rm -f ./tmp/base_os_image.tgz else - bundle exec rake stemcell:build_with_local_os_image[$IAAS,$HYPERVISOR,$OS_NAME,$OS_VERSION,$OS_IMAGE,$CANDIDATE_BUILD_NUMBER] + bundle exec rake stemcell:build_with_local_os_image[${IAAS},${HYPERVISOR},${OS_NAME},${OS_VERSION},${OS_IMAGE},${CANDIDATE_BUILD_NUMBER}] fi SUDO @@ -99,8 +99,8 @@ SUDO # Output and checksum the stemcell artifacts # -stemcell_name="bosh-stemcell-${CANDIDATE_BUILD_NUMBER}-$IAAS-$HYPERVISOR-$OS_NAME-$OS_VERSION${AGENT_SUFFIX}" -meta4_path="${REPO_PARENT}/stemcells-index-output/dev/$OS_NAME-$OS_VERSION/${CANDIDATE_BUILD_NUMBER}/$IAAS-$HYPERVISOR${AGENT_SUFFIX}.meta4" +stemcell_name="bosh-stemcell-${CANDIDATE_BUILD_NUMBER}-${IAAS}-${HYPERVISOR}-${OS_NAME}-${OS_VERSION}${AGENT_SUFFIX}" +meta4_path="${REPO_PARENT}/stemcells-index-output/dev/${OS_NAME}-${OS_VERSION}/${CANDIDATE_BUILD_NUMBER}/${IAAS}-${HYPERVISOR}${AGENT_SUFFIX}.meta4" echo "${CANDIDATE_BUILD_NUMBER}" > "${REPO_PARENT}/candidate-build-number/number" mkdir -p "$( dirname "$meta4_path" )" @@ -136,4 +136,4 @@ cd "${REPO_PARENT}/stemcells-index-output" git add -A git config --global user.email "${GIT_USER_EMAIL}" git config --global user.name "${GIT_USER_NAME}" -git commit -m "dev: ${OS_NAME}-${OS_VERSION}/${CANDIDATE_BUILD_NUMBER} ($IAAS-$HYPERVISOR)" +git commit -m "dev: ${OS_NAME}-${OS_VERSION}/${CANDIDATE_BUILD_NUMBER} (${IAAS}-${HYPERVISOR})" From b5ffe31e59e3cb124a7a084b86b84131739a5d89 Mon Sep 17 00:00:00 2001 From: aram price Date: Fri, 24 Apr 2026 15:14:00 -0700 Subject: [PATCH 19/24] Move metalink files to repo root - delete unused *.meta4 files - delete *.meta4 files for unsupported stemcells --- .../ubuntu-bionic/master/ubuntu-bionic.meta4 | 22 ------------------- .../1.x/ubuntu-jammy/1.x/ubuntu-jammy.meta4 | 22 ------------------- .../ubuntu-jammy/master/ubuntu-jammy.meta4 | 22 ------------------- .../ubuntu-jammy/ubuntu-jammy.meta4 | 22 ------------------- .../ubuntu_noble_poc/ubuntu-noble.meta4 | 21 ------------------ .../image-metalinks/ubuntu-bionic.meta4 | 22 ------------------- .../image-metalinks/ubuntu-jammy.meta4 | 22 ------------------- .../image-metalinks/ubuntu-xenial.meta4 | 22 ------------------- bosh-stemcell/image-metalinks/v1.0.0.meta4 | 22 ------------------- ...3164aeecc673509feb353f1367bd2154eb06.meta4 | 22 ------------------- ...980804e95d6cc952219e10e38d79c47c310c.meta4 | 22 ------------------- ci/pipelines/builder.yml | 4 ++-- ci/tasks/build-release-metadata.sh | 2 +- .../ubuntu-jammy/ubuntu-jammy.meta4 | 0 14 files changed, 3 insertions(+), 244 deletions(-) delete mode 100644 bosh-stemcell/image-metalinks/#ubuntu-bionic/master/ubuntu-bionic/master/ubuntu-bionic.meta4 delete mode 100644 bosh-stemcell/image-metalinks/#ubuntu-jammy/1.x/ubuntu-jammy/1.x/ubuntu-jammy.meta4 delete mode 100644 bosh-stemcell/image-metalinks/#ubuntu-jammy/master/ubuntu-jammy/master/ubuntu-jammy.meta4 delete mode 100644 bosh-stemcell/image-metalinks/#ubuntu-jammy/ubuntu-jammy/ubuntu-jammy.meta4 delete mode 100644 bosh-stemcell/image-metalinks/#ubuntu_noble_poc/ubuntu_noble_poc/ubuntu-noble.meta4 delete mode 100644 bosh-stemcell/image-metalinks/ubuntu-bionic.meta4 delete mode 100644 bosh-stemcell/image-metalinks/ubuntu-jammy.meta4 delete mode 100644 bosh-stemcell/image-metalinks/ubuntu-xenial.meta4 delete mode 100644 bosh-stemcell/image-metalinks/v1.0.0.meta4 delete mode 100644 bosh-stemcell/image-metalinks/v1c083164aeecc673509feb353f1367bd2154eb06.meta4 delete mode 100644 bosh-stemcell/image-metalinks/v6a93980804e95d6cc952219e10e38d79c47c310c.meta4 rename {bosh-stemcell/image-metalinks => image-metalinks}/ubuntu-jammy/ubuntu-jammy.meta4 (100%) diff --git a/bosh-stemcell/image-metalinks/#ubuntu-bionic/master/ubuntu-bionic/master/ubuntu-bionic.meta4 b/bosh-stemcell/image-metalinks/#ubuntu-bionic/master/ubuntu-bionic/master/ubuntu-bionic.meta4 deleted file mode 100644 index a1ab2c0ca7..0000000000 --- a/bosh-stemcell/image-metalinks/#ubuntu-bionic/master/ubuntu-bionic/master/ubuntu-bionic.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - 6c72db1d03708fae44a17d9f9be3420ad3ddde5e18bb1f8fb601e58710e8170da713b323a4d40fe783611a214c9920ccf6393ff6e7267512b84960f552d55901 - 2f8355ed75c694dff321a5f98f92a936fd35810305d50d35cfb6e35e630a2598 - 0c0c4cf1e0ba729e4f0c5c315b3a1de3c649f125 - 84e3fc496c6c7ac8d373fd56fa5d6ce3 - 286790464 - https://storage.googleapis.com/bosh-os-images/ubuntu-bionic/master/ubuntu-bionic.tgz - 337.0.0 - - - 903ef02644c352c516c55cbe7ed33e70b38a9b192ed0420f6ed226c411b2c677ee6f499c4f1989e08a759277fdee70949f72cdbe5d27b572c162283b2cfe5fa6 - d378f54909af9a9a70aec71b66d2ecfc51f5b53f88f3155c55c4b1760e8ba2d5 - 9d3e60fa24b62b7f5b55de9d8528505e6b404719 - d5ec64d573584692ba4865bae259bfa0 - 783601 - https://storage.googleapis.com/bosh-os-images/ubuntu-bionic/master/usn-log.json - 337.0.0 - - metalink-repository-resource/0.0.0 - 2023-06-13T01:13:20.928389437Z - diff --git a/bosh-stemcell/image-metalinks/#ubuntu-jammy/1.x/ubuntu-jammy/1.x/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/#ubuntu-jammy/1.x/ubuntu-jammy/1.x/ubuntu-jammy.meta4 deleted file mode 100644 index f1fc195dfe..0000000000 --- a/bosh-stemcell/image-metalinks/#ubuntu-jammy/1.x/ubuntu-jammy/1.x/ubuntu-jammy.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - ca7be8bd19177a614a7a0717709cd009176c6cf7695a6f158395bc0f4c8bdaede0b7c42ec517cbcd99cc1558b2fdc7fb14862a76f6c305176d17355385d2a902 - bb332a8df57b505f7364a172e39f6ab95d67fa2a4ae642603371382a2297088d - 51ac3964bdafa2f248d48fca664283f292f22b44 - a1326ac5155905973b1409b343ce1a5e - 430860544 - https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/1.x/ubuntu-jammy.tgz - 489.0.0 - - - b2b6f16a10d6ed63b77e3d073e072db6a7aec6eb672a30ba086e6f8e4b098175339be1d1e4354e8a8a7085d7f94fe83a77296f9eb334e855e81e68939a7e61a7 - 75523acfa75588b042de717aa305c2f8593e7a38acd8b8f77d66d9c569dbf0f3 - 2028feda31084fd95fb5c927316f9f8619f022ee - 457bf1471184262d36c87e632ce81aac - 52375 - https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/1.x/usn-log.json - 489.0.0 - - metalink-repository-resource/0.0.0 - 2024-08-05T08:28:47.382242007Z - diff --git a/bosh-stemcell/image-metalinks/#ubuntu-jammy/master/ubuntu-jammy/master/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/#ubuntu-jammy/master/ubuntu-jammy/master/ubuntu-jammy.meta4 deleted file mode 100644 index cc873af8de..0000000000 --- a/bosh-stemcell/image-metalinks/#ubuntu-jammy/master/ubuntu-jammy/master/ubuntu-jammy.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - 7e185e50222d73ef336bd7cbbabeb648bada80dcc9c11454a62a590677bdc91f6211f56bf96855bec6f042ac750807c4765173e6809f1b11287810e0cb5a7bc6 - 369b32914baa203571c6e0e7045c6c4b83476a3246a1f06dcda5c6a4da593e0f - 0563c2051357817f35cb54ccb52bdf06900ba787 - 4cc9365e967a151cd9eb246e6966561b - 430885414 - https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/master/ubuntu-jammy.tgz - 850.0.0 - - - 0bc18d9cc8d05d855c21607ce55b78d5d142eeb976bda9656a59e94b4cf2163d09f05d1d503cac7269e9a3fe9afa02f7bb77f387793231819c410eeffd9824e2 - 11e8000a33cbffe5a373cb1ad4bf6a6a96a269ae6072c5acf65ba9041701b826 - 82955ee559be21ad61e838504b2e577e34ec3fc0 - 4dabc2d44dcf4b94d33e3fedd1af8313 - 1661991 - https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/master/usn-log.json - 850.0.0 - - metalink-repository-resource/0.0.0 - 2024-08-05T23:29:41.609467109Z - diff --git a/bosh-stemcell/image-metalinks/#ubuntu-jammy/ubuntu-jammy/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/#ubuntu-jammy/ubuntu-jammy/ubuntu-jammy.meta4 deleted file mode 100644 index 1267922811..0000000000 --- a/bosh-stemcell/image-metalinks/#ubuntu-jammy/ubuntu-jammy/ubuntu-jammy.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - aeb67552084cdaf656d3271c60af1c014504f90321824f7ee1d732245141c6c3e4e6099248e64b69ecc9efd23aad4f7e33e2a168ee0da17628d5e6c0ce6a195d - c4532445a354ffb390931fc90b88e088022dbfa6cdd96f0cf53101df24fcc922 - 2b10241972af61d276424c258dab5f6ff12e517c - 8c1ea20362da6d57baf869ab8262929d - 431120344 - https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 521.0.0 - - - 63bd875d5568422551a1c8ef227f221cfa4895646814fd1cdd2f31a3e8c2e1e825ea50f186fc9ef900c9129f972fce6e08d367e20246bd27bc93170351266271 - 922d2f9f187ddf68fe6a56f06e238581790076348c0ce64a7fda611e4d7ef723 - ab6cf9e744d297818c6b84c261bb664f95e75815 - 8df8f84785759c32205c39419fe29823 - 4281 - https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 521.0.0 - - metalink-repository-resource/0.0.0 - 2024-09-05T18:43:31.624608394Z - diff --git a/bosh-stemcell/image-metalinks/#ubuntu_noble_poc/ubuntu_noble_poc/ubuntu-noble.meta4 b/bosh-stemcell/image-metalinks/#ubuntu_noble_poc/ubuntu_noble_poc/ubuntu-noble.meta4 deleted file mode 100644 index 4d224b9117..0000000000 --- a/bosh-stemcell/image-metalinks/#ubuntu_noble_poc/ubuntu_noble_poc/ubuntu-noble.meta4 +++ /dev/null @@ -1,21 +0,0 @@ - - - b2c51e76fe089e7f3cbbdcdf693111d6517dd25216128e7a819563ae0cf8c1bcda78d9649ea5968b1d58d6197d1ba952dfbbe6bb483c90e5711e81641b8e423d - 7012752463fb97a49d1b637f7abb0c81d36c39837f72fcfe41d0e9d52e033dde - ef083f3c99acf9e81035734327def290d229fc3b - 6c2d058faf24b879eed26983ebcb72e9 - 449041610 - https://storage.googleapis.com/bosh-os-images/ubuntu_noble_poc/ubuntu-noble.tgz - 76.0.0 - - - cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - da39a3ee5e6b4b0d3255bfef95601890afd80709 - d41d8cd98f00b204e9800998ecf8427e - https://storage.googleapis.com/bosh-os-images/ubuntu_noble_poc/usn-log.json - 76.0.0 - - metalink-repository-resource/0.0.0 - 2024-09-03T20:14:51.358532557Z - diff --git a/bosh-stemcell/image-metalinks/ubuntu-bionic.meta4 b/bosh-stemcell/image-metalinks/ubuntu-bionic.meta4 deleted file mode 100644 index 07ac6d8551..0000000000 --- a/bosh-stemcell/image-metalinks/ubuntu-bionic.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - ebf171ff0c7d8828f70268a042acf531d0c86acf9e490285f3f1dc50d69c8f94e7bb098eeba5f1f6cbffab17a8d55b26e61543237fafa19676927a0fde096ffe - d6a7e2b46c4d8842b211a0ade6dea6062dc459dadcfd56b09cd4cd93a6b3bd23 - 9f6d42e90eda5e22c61c023d01d158847abb2e22 - 2cf1136f8106bd991922dceff5879d82 - 592226141 - https://storage.googleapis.com/bosh-os-images/master/ubuntu-bionic.tgz - 58.0.0 - - - a966aafa6db71036d8ab2c027d6d9e1c4ff69ea420b4cb15112e845485604b3d4e5544fae1d5309dafd91fa8586bb4257b83b696847d065a4f13253abe60edfc - 78c807665a366e8e050ec98b7316660ba4a98289032def133fdc224ac78b1017 - c068e1121ab0fc8bf97382fcfbd348112269299a - 87cea6edd48b9b78b5511c3cf423b3ae - 115637 - https://storage.googleapis.com/bosh-os-images/master/usn-log.json - 58.0.0 - - metalink-repository-resource/0.0.0 - 2021-10-12T16:55:27.035293067Z - diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy.meta4 b/bosh-stemcell/image-metalinks/ubuntu-jammy.meta4 deleted file mode 100644 index b4cc189f52..0000000000 --- a/bosh-stemcell/image-metalinks/ubuntu-jammy.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - ff2c2fe45e6816b6867758f316a6d9ec48a7fb78b4b71d42481d5611f0836b28b4924c33f4479ac20e95148e07c476c12a7e3aea5ffb1dcc0a2a6655699d4900 - 1f7e5394d5eefee73e1638cdcd46fd8610064e9bb7ae0d9844e651fb273f6b1c - 34e816cdef091ce7a1b7d956125131287d24a732 - 60faefb24412736f45ca01b337916c78 - 850857569 - https://storage.googleapis.com/bosh-os-images/master/ubuntu-jammy.tgz - 12.0.0 - - - 876c8d1be3fae2fa371577754dc2f92d26210f648ed858d9076005a1185b22890f953ef15bbfabd4c7e009000b263fded55e0df3bbbe83a9726c3aad6f3ccd61 - 2141065cee76641e08a2b86c830e3197b74cfd948664478dc2c424e49378f868 - 3e424e5659d511819d491ce6076cdfad6a78e546 - 6eb0b13d11db4f4752e59b106ca67eef - 157253 - https://storage.googleapis.com/bosh-os-images/master/usn-log.json - 12.0.0 - - metalink-repository-resource/0.0.0 - 2021-12-03T23:58:09.916850729Z - diff --git a/bosh-stemcell/image-metalinks/ubuntu-xenial.meta4 b/bosh-stemcell/image-metalinks/ubuntu-xenial.meta4 deleted file mode 100644 index 42340e5b7a..0000000000 --- a/bosh-stemcell/image-metalinks/ubuntu-xenial.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - e6281b91226d80cd7a3c2e836802fb8b978031be35f21f23dbff05b69f0a347e24060a6347d8b60168deebbe0310d713afa9b98b6c18c548a8c2ea49ebf9ab76 - aca00c3fca2f7e1f58a3c546a2f2f8b857593ebb499ab29f636ca22d0a8f3424 - 11d28429070fb6f71f333b61056d75613337499e - 1ea224d8ecc36ddbd5dfc56f051bc71a - 507551879 - https://s3.amazonaws.com/bosh-os-images/master/ubuntu-xenial.tgz - 95.0.0 - - - d5d30b89b36d3b47fb65fecf2f92a8b6bb0ae24c4923ee73f86d60750ec078cea2df9ee2ecec4bdf66fb18739ef5f90b01bc2d22a55c526712107b7e4276b2cb - f4c8f2e1f662d703d2c828cfa0a8c17301d680f8c26bec5430814578ed8d4886 - d92912b002dabd7a47196c0bb5131db465b5b0ca - 58aaa34702e47b31a46e6c76bccadfcf - 223715 - https://s3.amazonaws.com/bosh-os-images/master/usn-log.json - 95.0.0 - - metalink-repository-resource/0.0.0 - 2020-09-30T11:01:20.308981444Z - diff --git a/bosh-stemcell/image-metalinks/v1.0.0.meta4 b/bosh-stemcell/image-metalinks/v1.0.0.meta4 deleted file mode 100644 index b306b36afb..0000000000 --- a/bosh-stemcell/image-metalinks/v1.0.0.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - eca2d80ab27bf779f6ded1a52df9a11c1bbdd8cc37bab19b536fd4bdbb39aac66e54b584630584f7efbdd934a50b174b55c707c5fc9dfedbe63de19bde79c9de - def0b4ece6cd6f0e5db3735733c88495a7332a7ab0b71e51628db1182e165c5d - d651d5be598fe4119b4fe7e606dfea044a30742c - 9dd9a33de65320fe2c314d4393570e6c - 504414568 - https://s3.amazonaws.com/bosh-os-images/ubuntu-xenial.tgz - 1.0.0 - - - a6bc47fabfbbb16d392bf31fc56ad47bcdaa3b2a566e6f91017e986e4b0d8e511034f3a41991cc76890bf8b73119c7f78e8e33d1257519bcd6c98bae02d58538 - 1ffdff9c2596ae766e90efc5f52610aa23b681a990596fa0ce207f1b5e58a9a0 - dd5e62f6183e77c1e6aef52235e19ce0a6275bce - 9f6bab5ad8e1448ed18de05d62e336aa - 19909 - https://s3.amazonaws.com/bosh-os-images/usn-log.json - 1.0.0 - - metalink-repository-resource/0.0.0 - 2019-10-10T18:12:07.291713659Z - diff --git a/bosh-stemcell/image-metalinks/v1c083164aeecc673509feb353f1367bd2154eb06.meta4 b/bosh-stemcell/image-metalinks/v1c083164aeecc673509feb353f1367bd2154eb06.meta4 deleted file mode 100644 index 87a47e6687..0000000000 --- a/bosh-stemcell/image-metalinks/v1c083164aeecc673509feb353f1367bd2154eb06.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - 266165ec65aaa25cb08681906f6e4c5d3382be22d408c8e3a511ed6c77afcbd8aaacd92ba085673d8893418cc0838073b4220630c237226d3039cfc44655b18e - 591721c0baf41f2b127f23e9a65e10bf27e58e60d346b86a1c6e721336a3b3c1 - f3b904d921dea1f4f0c9809532a147a69208957a - 00f5b4cbee8fca6af57c6259bca1bb63 - 504445725 - https://s3.amazonaws.com/bosh-os-images/ubuntu-xenial.tgz - 1c083164aeecc673509feb353f1367bd2154eb06 - - - a6bc47fabfbbb16d392bf31fc56ad47bcdaa3b2a566e6f91017e986e4b0d8e511034f3a41991cc76890bf8b73119c7f78e8e33d1257519bcd6c98bae02d58538 - 1ffdff9c2596ae766e90efc5f52610aa23b681a990596fa0ce207f1b5e58a9a0 - dd5e62f6183e77c1e6aef52235e19ce0a6275bce - 9f6bab5ad8e1448ed18de05d62e336aa - 19909 - https://s3.amazonaws.com/bosh-os-images/usn-log.json - 1c083164aeecc673509feb353f1367bd2154eb06 - - metalink-repository-resource/0.0.0 - 2019-10-09T23:56:32.263413675Z - diff --git a/bosh-stemcell/image-metalinks/v6a93980804e95d6cc952219e10e38d79c47c310c.meta4 b/bosh-stemcell/image-metalinks/v6a93980804e95d6cc952219e10e38d79c47c310c.meta4 deleted file mode 100644 index fd444f727b..0000000000 --- a/bosh-stemcell/image-metalinks/v6a93980804e95d6cc952219e10e38d79c47c310c.meta4 +++ /dev/null @@ -1,22 +0,0 @@ - - - dad1b88448b2dc3e4e4bc46d45ef1ff28e0f82e35097fe4d4a243e01e359036ad7507ca1263ad2556c3acb0c5e57a06eff8dd4097cee2552ed756de34dd8cbed - 9f98f1753bc592344bfb739a2a4e5629f3439da9c403d37f43bf408533e69637 - bc9f1d08e9a7c25de8171708bf704d084e03783f - fb159e9f1236e1b5c382a21dfff1e3da - 504425620 - https://s3.amazonaws.com/bosh-os-images/ubuntu-xenial.tgz - 6a93980804e95d6cc952219e10e38d79c47c310c - - - a6bc47fabfbbb16d392bf31fc56ad47bcdaa3b2a566e6f91017e986e4b0d8e511034f3a41991cc76890bf8b73119c7f78e8e33d1257519bcd6c98bae02d58538 - 1ffdff9c2596ae766e90efc5f52610aa23b681a990596fa0ce207f1b5e58a9a0 - dd5e62f6183e77c1e6aef52235e19ce0a6275bce - 9f6bab5ad8e1448ed18de05d62e336aa - 19909 - https://s3.amazonaws.com/bosh-os-images/usn-log.json - 6a93980804e95d6cc952219e10e38d79c47c310c - - metalink-repository-resource/0.0.0 - 2019-10-10T00:17:56.310719609Z - diff --git a/ci/pipelines/builder.yml b/ci/pipelines/builder.yml index a83aaa0aeb..7db68e8d6e 100644 --- a/ci/pipelines/builder.yml +++ b/ci/pipelines/builder.yml @@ -943,7 +943,7 @@ resources: private_key: ((github_deploy_key_bosh-linux-stemcell-builder.private_key)) filters: - repositorypath: "(@= data.values.stemcell_details.branch @)/(@= data.values.stemcell_details.os_name @).meta4" - uri: git+ssh://git@github.com/cloudfoundry/bosh-linux-stemcell-builder.git//bosh-stemcell/image-metalinks/#(@= data.values.stemcell_details.branch @) + uri: git+ssh://git@github.com/cloudfoundry/bosh-linux-stemcell-builder.git//image-metalinks/#(@= data.values.stemcell_details.branch @) url_handlers: - include: - (s3|https)://.* @@ -981,7 +981,7 @@ resources: branch: (@= data.values.stemcell_details.branch @) ignore_paths: - ci - - bosh-stemcell/image-metalinks/ + - image-metalinks - VERSION uri: https://github.com/cloudfoundry/bosh-linux-stemcell-builder diff --git a/ci/tasks/build-release-metadata.sh b/ci/tasks/build-release-metadata.sh index 5ef9a4049d..8311ec71e3 100755 --- a/ci/tasks/build-release-metadata.sh +++ b/ci/tasks/build-release-metadata.sh @@ -47,7 +47,7 @@ if [[ "${OS_NAME}" == "ubuntu" ]]; then # Ensure URL for usn-log from metalink exists before attempting to download. usn_log_json_file="${REPO_PARENT}/bosh-linux-stemcell-builder/usn-log.json" touch "${usn_log_json_file}" - usn_metalink_path="${REPO_PARENT}/bosh-linux-stemcell-builder/bosh-stemcell/image-metalinks/${BRANCH}/${OS_NAME}-${OS_VERSION}.meta4" + usn_metalink_path="${REPO_PARENT}/bosh-linux-stemcell-builder/image-metalinks/${BRANCH}/${OS_NAME}-${OS_VERSION}.meta4" if [[ -n "$(meta4 file-urls --metalink "${usn_metalink_path}" --file usn-log.json)" ]]; then meta4 file-download \ --skip-hash-verification \ diff --git a/bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 similarity index 100% rename from bosh-stemcell/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 rename to image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 From c9d65dadd8dbe9d81a7e0028fec11b7358b8ee44 Mon Sep 17 00:00:00 2001 From: aram price Date: Fri, 24 Apr 2026 16:04:46 -0700 Subject: [PATCH 20/24] CI: use concourse to fetch OS_IMAGE Remove conditional path in CI that could download the OS_IMAGE using `meta4 file-download`. Remove rake tasks which supported this path, and remove references from docs. --- README.md | 10 +++++----- Rakefile | 50 ---------------------------------------------- ci/tasks/build.sh | 15 +++----------- ci/tasks/build.yml | 1 - 4 files changed, 8 insertions(+), 68 deletions(-) diff --git a/README.md b/README.md index 33096dc568..5bc014e39a 100644 --- a/README.md +++ b/README.md @@ -143,11 +143,11 @@ container): ### How to Run Tests for Stemcell -When you run the `stemcell:build_with_local_os_image` or `stemcell:build` rake -task, it will create a stemcell that it runs the stemcell specific tests -against. You will need to run the **rake task the first time you create your -docker container**, but everytime after, as long as you do not destroy the -container, you should be able to run the specific tests: +When you run the `stemcell:build_with_local_os_image` rake task, it will create +a stemcell that it runs the stemcell specific tests against. You will need to +run the **rake task the first time you create your docker container**, but +everytime after, as long as you do not destroy the container, you should be +able to run the specific tests: ```shell cd /opt/bosh/bosh-stemcell; \ diff --git a/Rakefile b/Rakefile index ac59a00fa2..de6bc48c0c 100644 --- a/Rakefile +++ b/Rakefile @@ -42,56 +42,6 @@ namespace :stemcell do end end - desc 'Download a remote pre-built base OS image' - task :download_os_image, [:operating_system_name, :operating_system_version] do |_, args| - begin - puts "Using OS image #{args.operating_system_name}-#{args.operating_system_version}" - - mkdir_p('tmp') - - metalink_path = File.join( - Dir.pwd, - 'bosh-stemcell', - 'image-metalinks', - "#{args.operating_system_name}-#{args.operating_system_version}.meta4" - ) - - os_image_path = File.join(Dir.pwd, 'tmp', 'base_os_image.tgz') - `meta4 file-download --file #{args.operating_system_name}-#{args.operating_system_version}.tgz --metalink #{metalink_path} #{os_image_path}` - raise 'Failed to download metalink' if $?.exitstatus != 0 - - puts "Successfully downloaded OS image to #{os_image_path}" - rescue RuntimeError => e - print_help - raise e - end - end - - desc 'Build a stemcell with a remote pre-built base OS image' - task :build, [:infrastructure_name, :hypervisor_name, :operating_system_name, :operating_system_version, :build_number] do |_, args| - begin - Rake::Task['stemcell:download_os_image'].invoke( - args.operating_system_name, - args.operating_system_version - ) - - os_image_path = File.join(Dir.pwd, 'tmp', 'base_os_image.tgz') - args.with_defaults(build_number: '0000') - - Rake::Task['stemcell:build_with_local_os_image'].invoke( - args.infrastructure_name, - args.hypervisor_name, - args.operating_system_name, - args.operating_system_version, - os_image_path, - args.build_number - ) - rescue RuntimeError => e - print_help - raise e - end - end - desc 'Build a stemcell using a local pre-built base OS image' task :build_with_local_os_image, [:infrastructure_name, :hypervisor_name, :operating_system_name, :operating_system_version, :os_image_path, :build_number] do |_, args| begin diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh index 0b169ee9bd..af7248bff4 100755 --- a/ci/tasks/build.sh +++ b/ci/tasks/build.sh @@ -24,6 +24,8 @@ check_param HYPERVISOR check_param OS_NAME check_param OS_VERSION +OS_IMAGE="$(readlink -f "${REPO_PARENT}/os-image-tarball"/*.tgz)" + export CANDIDATE_BUILD_NUMBER=$( cat "${REPO_PARENT}/version/number" | sed 's/\.0$//;s/\.0$//' ) git clone "${REPO_PARENT}/stemcells-index" "${REPO_PARENT}/stemcells-index-output" @@ -74,12 +76,6 @@ chown -R ubuntu:ubuntu "${REPO_ROOT}" # ci resource chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder" chown -R ubuntu:ubuntu /mnt -OS_IMAGE="" -mkdir -p "${REPO_PARENT}/os-image-tarball" -if [[ -n "$(ls -A "${REPO_PARENT}/os-image-tarball/")" ]]; then - OS_IMAGE="$(readlink -f "${REPO_PARENT}/os-image-tarball"/*.tgz)" -fi - sudo chmod u+s "$(which sudo)" sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i < Date: Fri, 24 Apr 2026 16:18:38 -0700 Subject: [PATCH 21/24] Rename task `stemcell:build_with_local_os_image` -> `:build` --- README.md | 16 ++++++++-------- Rakefile | 4 ++-- ci/tasks/build.sh | 4 ++-- ci/tasks/os-images/build.sh | 15 +++++++++------ 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 5bc014e39a..6ae8dde07f 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ popd bundle exec rake stemcell:build_os_image[ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz] # build vSphere stemcell -bundle exec rake stemcell:build_with_local_os_image[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz] +bundle exec rake stemcell:build[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz] ``` When building a vSphere stemcell, you must download `VMware-ovftool-*.bundle` @@ -81,10 +81,10 @@ Rebuild the stemcell when you are making and testing BOSH-specific changes such export short_name="jammy" export build_number="0.0.8" -bundle exec rake stemcell:build_with_local_os_image[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz,${build_number}] +bundle exec rake stemcell:build[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz,${build_number}] ``` -The arguments to `stemcell:build_with_local_os_image` are: +The arguments to `stemcell:build` are: 1. `infrastructure_name`: Which IaaS you are producing the stemcell for. Determines which virtualization tools to package on top of the stemcell. @@ -143,11 +143,11 @@ container): ### How to Run Tests for Stemcell -When you run the `stemcell:build_with_local_os_image` rake task, it will create -a stemcell that it runs the stemcell specific tests against. You will need to -run the **rake task the first time you create your docker container**, but -everytime after, as long as you do not destroy the container, you should be -able to run the specific tests: +When you run the `stemcell:build` rake task, it will create a stemcell that it +runs the stemcell-specific tests against. You will need to run the **rake task +the first time you create your docker container**, but every time after, as +long as you do not destroy the container, you should be able to run the +specific tests: ```shell cd /opt/bosh/bosh-stemcell; \ diff --git a/Rakefile b/Rakefile index de6bc48c0c..287b1ae269 100644 --- a/Rakefile +++ b/Rakefile @@ -42,8 +42,8 @@ namespace :stemcell do end end - desc 'Build a stemcell using a local pre-built base OS image' - task :build_with_local_os_image, [:infrastructure_name, :hypervisor_name, :operating_system_name, :operating_system_version, :os_image_path, :build_number] do |_, args| + desc 'Build a stemcell, requires `os_image_path` pointing at an image created via `stemcell:build_os_image`' + task :build, [:infrastructure_name, :hypervisor_name, :operating_system_name, :operating_system_version, :os_image_path, :build_number] do |_, args| begin require 'bosh/stemcell/build_environment' require 'bosh/stemcell/definition' diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh index af7248bff4..d69d2b5cdc 100755 --- a/ci/tasks/build.sh +++ b/ci/tasks/build.sh @@ -75,15 +75,15 @@ done chown -R ubuntu:ubuntu "${REPO_ROOT}" # ci resource chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder" chown -R ubuntu:ubuntu /mnt - sudo chmod u+s "$(which sudo)" + sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i < Date: Fri, 24 Apr 2026 23:46:14 +0000 Subject: [PATCH 22/24] 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 b66c4ab0fa..3779d18c98 100644 --- a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,12 +1,12 @@ - f26ed53e0b9546536501b81ebfdc1c3a647e3bb09bb535befdbd7578730a035ff05b0ac9ad6beb006b79e62621fe3977b0e41a6e1d2b0c351850036412036c1a - 7d926be2ae1703a5c822cabc926a2881b6edd7b20ff79f3b5df379750588ee93 - 14e884acc5ca1dddb5a702e86c526684604f6db0 - 2be15d67a427c45e34c4e4892334d208 - 434787979 + 4d63eb6d8d7eba07628372c969bfdf3a778a66ef77e85616a84f900c603dc53c63c314bb2ded2e073f81e5243507fb3d58ad8f9d84fde0e16bc01f6d2221c616 + 8bf6a4b8a98d71b4c26f41ce4b8622c939de05d82dabdd0ea8e03d44de843db6 + d21ab0b19c1a3f52bb7e348b69b28663ee676503 + f0210c187eb07d66f8ea31f796a4aa76 + 434793371 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1042.0.0 + 1043.0.0 ca3e99837fae81c10f5522a623fab715b1e430f7895b1f202bae32ccfe3a6f80ad79cffcbd789adcf099de7b00f7cc8c31ebbb3aeb5c0e13aa7decea88bc1559 @@ -15,8 +15,8 @@ 6c72c53f5bb8d8d05dd9b377f3beb937 869 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1042.0.0 + 1043.0.0 metalink-repository-resource/0.0.0 - 2026-04-23T21:32:55.236350743Z + 2026-04-24T23:46:02.968990444Z From efc57d38dd186b4b08e0a087251d97b3b5dc7c60 Mon Sep 17 00:00:00 2001 From: aram price Date: Fri, 24 Apr 2026 17:26:26 -0700 Subject: [PATCH 23/24] Move image-metalinks to prepare for merge --- .../ubuntu_noble_poc/ubuntu-noble.meta4 | 21 ------------------- .../ubuntu-noble/ubuntu-noble.meta4 | 0 2 files changed, 21 deletions(-) delete mode 100644 bosh-stemcell/image-metalinks/ubuntu_noble_poc/ubuntu-noble.meta4 rename {bosh-stemcell/image-metalinks => image-metalinks}/ubuntu-noble/ubuntu-noble.meta4 (100%) diff --git a/bosh-stemcell/image-metalinks/ubuntu_noble_poc/ubuntu-noble.meta4 b/bosh-stemcell/image-metalinks/ubuntu_noble_poc/ubuntu-noble.meta4 deleted file mode 100644 index 8db4724a1b..0000000000 --- a/bosh-stemcell/image-metalinks/ubuntu_noble_poc/ubuntu-noble.meta4 +++ /dev/null @@ -1,21 +0,0 @@ - - - 3696c6d14e8a9e5034266fa48e63e9fcf3f41d5fe171d89b33a1dec285d23dd50d88732c2b6e634f03a2763907bab308026fcfe4222512dedd20f40f7f995ba1 - b1d212d106171ca9e731d720b9f2a3c9949ad02efbeb35b1307072433c3a8551 - 0d491d6a64dd44cfe822e097bf152b8a56fc65a7 - b0058032614f6a828b3dca999ff06d85 - 450553899 - https://storage.googleapis.com/bosh-os-images/ubuntu_noble_poc/ubuntu-noble.tgz - 115.0.0 - - - cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - da39a3ee5e6b4b0d3255bfef95601890afd80709 - d41d8cd98f00b204e9800998ecf8427e - https://storage.googleapis.com/bosh-os-images/ubuntu_noble_poc/usn-log.json - 115.0.0 - - metalink-repository-resource/0.0.0 - 2024-10-31T16:04:24.1056664Z - diff --git a/bosh-stemcell/image-metalinks/ubuntu-noble/ubuntu-noble.meta4 b/image-metalinks/ubuntu-noble/ubuntu-noble.meta4 similarity index 100% rename from bosh-stemcell/image-metalinks/ubuntu-noble/ubuntu-noble.meta4 rename to image-metalinks/ubuntu-noble/ubuntu-noble.meta4 From cd4d01f47c3ab8723ef7f243e18a4fb9a56025d1 Mon Sep 17 00:00:00 2001 From: aram price Date: Fri, 24 Apr 2026 17:32:27 -0700 Subject: [PATCH 24/24] Fixup bad merge --- bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt b/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt index 562277d032..826f382eb1 100644 --- a/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt +++ b/bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt @@ -4,7 +4,6 @@ linux-cloud-tools-6.8 linux-cloud-tools-6.8-generic linux-cloud-tools-common linux-cloud-tools-generic -netplan-generator netplan.io python-is-python3 python3-attr @@ -12,7 +11,6 @@ python3-certifi python3-chardet python3-configobj python3-debconf -python3-netplan python3-idna python3-jinja2 python3-json-pointer