From 8c989bc9fd90c916436795f6e1897054eec53d26 Mon Sep 17 00:00:00 2001
From: CI Bot <infra@cloudfoundry.org>
Date: Tue, 9 Jun 2026 00:05:50 +0000
Subject: [PATCH 1/4] 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 3835f060f8..19123e9d81 100644
--- a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4
+++ b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4
@@ -1,12 +1,12 @@
 <metalink xmlns="urn:ietf:params:xml:ns:metalink">
   <file name="ubuntu-jammy.tgz">
-    <hash type="sha-512">4b01c2f0dd1add3cde3292087f90123b733fe4983b5b9f328711cbf122b5bb4ecef46a7a9a63984cbc6ebca40e30629f77123e130b7c6e55c759c109c31db8f2</hash>
-    <hash type="sha-256">3643e182d29678319c989dabb9ace9a215785b2d29f732904775853dbaa71b59</hash>
-    <hash type="sha-1">3958f4d0679c50729c0638db2ecbac5dce0e0960</hash>
-    <hash type="md5">4fef24c5144750d091a2f1601e8a204e</hash>
-    <size>435192936</size>
+    <hash type="sha-512">64d8a1bc8cd5f30db59b78ebdf2e293319902f726468ec5f750a428ad9425f94c4ff111750bc7d27381f5984759e3f2d4a7cb99f01080e137e9be891d015fc43</hash>
+    <hash type="sha-256">14046e5d113c9eed5c8cc9d85cb336de4860fc9a1712416315f338b4034fc3a1</hash>
+    <hash type="sha-1">bb4dcc4621afde1dab584eee849650006674064c</hash>
+    <hash type="md5">e10b11b60afa300c0f353ee512cc848a</hash>
+    <size>435205706</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
-    <version>1080.0.0</version>
+    <version>1081.0.0</version>
   </file>
   <file name="usn-log.json">
     <hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
@@ -15,8 +15,8 @@
     <hash type="md5">68b329da9893e34099c7d8ad5cb9c940</hash>
     <size>1</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json</url>
-    <version>1080.0.0</version>
+    <version>1081.0.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-06-08T22:51:23.443948018Z</published>
+  <published>2026-06-09T00:05:40.828805212Z</published>
 </metalink>

From ce64c59036a3e1e4a1acd1fcf1ddb62f62a5ffe4 Mon Sep 17 00:00:00 2001
From: aram price <aram.price@broadcom.com>
Date: Tue, 9 Jun 2026 12:13:55 -0700
Subject: [PATCH 2/4] Add resolute to contribution guide.

---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b2022eece4..4a75194451 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,7 @@ Branches are names for the Ubuntu release on which they are based.  For example
 an "Ubuntu SHORT_NAME" based stemcell will be on the branch: 
 - `ubuntu-<short_name>`
 
-As of `2026-04-03` the following stemcell lines / branches are supported:
+As of `2026-06-09` the following stemcell lines / branches are supported:
 - Ubuntu Jammy / `ubuntu-jammy`
 - Ubuntu Noble / `ubuntu-noble`
+- Ubuntu Resolute / `ubuntu-resolute`

From fdfb38e512acb597b2548f8611bf20dfbe8dc64c Mon Sep 17 00:00:00 2001
From: CI Bot <infra@cloudfoundry.org>
Date: Tue, 9 Jun 2026 19:33:31 +0000
Subject: [PATCH 3/4] 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 19123e9d81..7b39b27a6f 100644
--- a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4
+++ b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4
@@ -1,12 +1,12 @@
 <metalink xmlns="urn:ietf:params:xml:ns:metalink">
   <file name="ubuntu-jammy.tgz">
-    <hash type="sha-512">64d8a1bc8cd5f30db59b78ebdf2e293319902f726468ec5f750a428ad9425f94c4ff111750bc7d27381f5984759e3f2d4a7cb99f01080e137e9be891d015fc43</hash>
-    <hash type="sha-256">14046e5d113c9eed5c8cc9d85cb336de4860fc9a1712416315f338b4034fc3a1</hash>
-    <hash type="sha-1">bb4dcc4621afde1dab584eee849650006674064c</hash>
-    <hash type="md5">e10b11b60afa300c0f353ee512cc848a</hash>
-    <size>435205706</size>
+    <hash type="sha-512">aea9d114124dd96611935299222b29b9ad03537e90c4c0e0d41205012fc97b140113e8ed972d376a6da9b44fc8bab0f60bd1d92b51adbf29ed6cb241bbaf12d3</hash>
+    <hash type="sha-256">d93c7bb07f9d429772f8cb9386bf8d147b3d3a631fa1f9a578643faba9177f2a</hash>
+    <hash type="sha-1">3b14ab2843defa3355adea3f5f44381cec1af0af</hash>
+    <hash type="md5">b113324e19a4d450a7cf8c3d8e9efbe8</hash>
+    <size>435212632</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
-    <version>1081.0.0</version>
+    <version>1082.0.0</version>
   </file>
   <file name="usn-log.json">
     <hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
@@ -15,8 +15,8 @@
     <hash type="md5">68b329da9893e34099c7d8ad5cb9c940</hash>
     <size>1</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json</url>
-    <version>1081.0.0</version>
+    <version>1082.0.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-06-09T00:05:40.828805212Z</published>
+  <published>2026-06-09T19:33:14.185742096Z</published>
 </metalink>

From b0425195574e84aa13acf84d141ffd514fa5e36f Mon Sep 17 00:00:00 2001
From: Matthew Kocher <matthew.kocher@broadcom.com>
Date: Tue, 9 Jun 2026 14:12:14 -0700
Subject: [PATCH 4/4] ci: fix oci image build

---
 ci/pipelines/builder.yml      | 40 ++++++++++++++++++++---------------
 ci/tasks/build-docker-args.sh | 21 +++++++-----------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/ci/pipelines/builder.yml b/ci/pipelines/builder.yml
index 9f31b4eb00..b77960d333 100644
--- a/ci/pipelines/builder.yml
+++ b/ci/pipelines/builder.yml
@@ -81,17 +81,31 @@ jobs:
     - task: build-docker-args
       file: bosh-stemcells-ci/ci/tasks/build-docker-args.yml
       image: ubuntu_base
-    - put: os-image-stemcell-builder-docker-image
+    - task: build-image
+      privileged: true
+      config:
+        platform: linux
+        image_resource:
+          type: registry-image
+          source:
+            repository: concourse/oci-build-task
+        inputs:
+        - name: os-image-stemcell-builder-dockerfile
+        - name: docker-build-args
+        outputs:
+        - name: image
+        params:
+          CONTEXT: os-image-stemcell-builder-dockerfile/ci/docker/os-image-stemcell-builder
+          BUILD_ARGS_FILE: docker-build-args/docker-build-args.yml
+          BUILD_ARG_BASE_IMAGE: ubuntu:(@= data.values.stemcell_details.os_short_name @)
+          BUILD_ARG_OVF_TOOL_INSTALLER: "VMware-ovftool-4.4.3-18663434-lin.x86_64.bundle"
+          BUILD_ARG_OVF_TOOL_INSTALLER_SHA1: "6c24e473be49c961cfc3bb16774b52b48e822991"
+        run:
+          path: build
+    - put: os-image-stemcell-builder-registry-image
       no_get: true
       params:
-        build: os-image-stemcell-builder-dockerfile/ci/docker/os-image-stemcell-builder
-        build_args_file: docker-build-args/docker-build-args.json
-        build_args:
-          BASE_IMAGE: ubuntu:(@= data.values.stemcell_details.os_short_name @)
-          OVF_TOOL_INSTALLER: "VMware-ovftool-4.4.3-18663434-lin.x86_64.bundle"
-          OVF_TOOL_INSTALLER_SHA1: "6c24e473be49c961cfc3bb16774b52b48e822991"
-      get_params:
-        skip_download: true
+        image: image/image.tar
 
 #! Manually triggered job that idempotently ensures the GCP subnetwork and
 #! firewall rule consumed by deploy-director / cleanup-bats-vms / prepare-bats
@@ -1177,14 +1191,6 @@ resources:
     username: ((dockerhub_username))
     password: ((dockerhub_password))
 
-- name: os-image-stemcell-builder-docker-image
-  type: docker-image
-  source:
-    repository: bosh/os-image-stemcell-builder
-    tag: (@= data.values.stemcell_details.os_short_name @)
-    username: ((dockerhub_username))
-    password: ((dockerhub_password))
-
 - name: bosh-os-image-builder-vmware-ovftool
   type: gcs-resource
   source:
diff --git a/ci/tasks/build-docker-args.sh b/ci/tasks/build-docker-args.sh
index beeb9ea540..d56f2c02c0 100755
--- a/ci/tasks/build-docker-args.sh
+++ b/ci/tasks/build-docker-args.sh
@@ -31,18 +31,13 @@ ruby_install_url="$(curl -s https://api.github.com/repos/postmodern/ruby-install
 ruby_version="$(cat "${REPO_ROOT}/.ruby-version")"
 gem_home="/usr/local/bundle"
 
-cat << EOF > "${REPO_PARENT}/docker-build-args/docker-build-args.json"
-{
-  "META4_CLI_URL": "${meta4_cli_url}",
-  "SYFT_CLI_URL": "${syft_cli_url}",
-  "YQ_CLI_URL": "${yq_cli_url}",
-
-  "RUBY_INSTALL_URL": "${ruby_install_url}",
-  "RUBY_VERSION": "${ruby_version}",
-  "GEM_HOME": "${gem_home}",
-
-  "placeholder": "without trailing comma"
-}
+cat << EOF > "${REPO_PARENT}/docker-build-args/docker-build-args.yml"
+META4_CLI_URL: "${meta4_cli_url}"
+SYFT_CLI_URL: "${syft_cli_url}"
+YQ_CLI_URL: "${yq_cli_url}"
+RUBY_INSTALL_URL: "${ruby_install_url}"
+RUBY_VERSION: "${ruby_version}"
+GEM_HOME: "${gem_home}"
 EOF
 
-cat "${REPO_PARENT}/docker-build-args/docker-build-args.json"
+cat "${REPO_PARENT}/docker-build-args/docker-build-args.yml"