Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Comment thread
aramprice marked this conversation as resolved.
40 changes: 23 additions & 17 deletions ci/pipelines/builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
21 changes: 8 additions & 13 deletions ci/tasks/build-docker-args.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment thread
aramprice marked this conversation as resolved.
16 changes: 8 additions & 8 deletions image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4
Original file line number Diff line number Diff line change
@@ -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">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>1080.0.0</version>
<version>1082.0.0</version>
</file>
<file name="usn-log.json">
<hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
Expand All @@ -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>1082.0.0</version>
</file>
<generator>metalink-repository-resource/0.0.0</generator>
<published>2026-06-08T22:51:23.443948018Z</published>
<published>2026-06-09T19:33:14.185742096Z</published>
</metalink>
Loading