Skip to content

Merge noble => resolute #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aramprice merged 5 commits into from
Jun 10, 2026
Merged

Merge noble => resolute #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a2c430
Bump os-image tgz
bosh-admin-bot Jun 9, 2026
7529172
CI: remove (future) deprecated `--preserve-env` flag
aramprice Jun 9, 2026
e51599f
CI: use explicit list with `--preserve-env`
aramprice Jun 10, 2026
6ba0f9e
CI: pass `SHLVL` to make `~ubuntu/.bash_logout` succeed
aramprice Jun 10, 2026
0be770f
Bump os-image tgz
bosh-admin-bot Jun 10, 2026
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
7 changes: 5 additions & 2 deletions ci/tasks/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,16 @@ 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 <<SUDO
# pass SHLVL or '~ubuntu/.bash_logout' will exit 1
Comment thread
aramprice marked this conversation as resolved.
sudo --set-home --user ubuntu \
--preserve-env=GEM_HOME,SHLVL,UBUNTU_ADVANTAGE_TOKEN,UBUNTU_FIPS_USE_IAAS_KERNEL \
-- /bin/bash --login <<SUDO
Comment thread
aramprice marked this conversation as resolved.
set -e

cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
bundle install
Comment thread
aramprice marked this conversation as resolved.

bundle exec rake stemcell:build[${IAAS},${HYPERVISOR},${OS_NAME},${OS_VERSION},${OS_IMAGE},${CANDIDATE_BUILD_NUMBER}]
bundle exec rake "stemcell:build[${IAAS},${HYPERVISOR},${OS_NAME},${OS_VERSION},${OS_IMAGE},${CANDIDATE_BUILD_NUMBER}]"
SUDO

#
Expand Down
7 changes: 5 additions & 2 deletions ci/tasks/os-images/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@ 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 <<SUDO
# pass SHLVL or '~ubuntu/.bash_logout' will exit 1
Comment thread
aramprice marked this conversation as resolved.
sudo --set-home --user ubuntu \
--preserve-env=GEM_HOME,SHLVL,BUILD_TIME,UBUNTU_ADVANTAGE_TOKEN,UBUNTU_DEBOOTSTRAP_MIRROR \
-- /bin/bash --login <<SUDO
Comment thread
aramprice marked this conversation as resolved.
set -e

cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
Comment thread
aramprice marked this conversation as resolved.
bundle install

bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
bundle exec rake "stemcell:build_os_image[${OPERATING_SYSTEM_NAME},${OPERATING_SYSTEM_VERSION},${OS_IMAGE}]"
SUDO
16 changes: 8 additions & 8 deletions image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4
View file
Open in desktop
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">aea9d114124dd96611935299222b29b9ad03537e90c4c0e0d41205012fc97b140113e8ed972d376a6da9b44fc8bab0f60bd1d92b51adbf29ed6cb241bbaf12d3</hash>
<hash type="sha-256">d93c7bb07f9d429772f8cb9386bf8d147b3d3a631fa1f9a578643faba9177f2a</hash>
<hash type="sha-1">3b14ab2843defa3355adea3f5f44381cec1af0af</hash>
<hash type="md5">b113324e19a4d450a7cf8c3d8e9efbe8</hash>
<size>435212632</size>
<hash type="sha-512">fab1ec89357516ccedd49d3c1a2f9e8db258ce7e69bb158fdd3ea825b3e2556d89606f0bbb5f83117d3b437a955998a346cfda3b0ffdf7797e4941ad4187ed2a</hash>
<hash type="sha-256">119afe900ff3339ae2f7edfd59b19582971f5d1de61e5bba3c269c8ea3233614</hash>
<hash type="sha-1">d7e7142fc0486c0a3b8a5c3b317b47dbb2fd188d</hash>
<hash type="md5">69c8530406c7669f7d99e5d8289a2b6f</hash>
<size>435214502</size>
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
<version>1082.0.0</version>
<version>1083.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>1082.0.0</version>
<version>1083.0.0</version>
</file>
<generator>metalink-repository-resource/0.0.0</generator>
<published>2026-06-09T19:33:14.185742096Z</published>
<published>2026-06-10T03:34:35.655940604Z</published>
</metalink>
16 changes: 8 additions & 8 deletions image-metalinks/ubuntu-noble/ubuntu-noble.meta4
View file
Open in desktop
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-noble.tgz">
<hash type="sha-512">2a4f68f9fbb415bd4543dfcef25b5dd04a7a6c90019e7737b0451c88d0dd4f54695ebce54a2ed2cc05aaec0c7fc2f9c1b7423368cf8f883f1fd83902992503df</hash>
<hash type="sha-256">0fa498c22e69c9dc3cb68111c946bec576722cb3ab3460522ac3e1825ba964e3</hash>
<hash type="sha-1">392a7bf9092f27799f113385aa7bf82c541276f4</hash>
<hash type="md5">91b68fea99a6a4223770537ccadfb469</hash>
<size>377533063</size>
<hash type="sha-512">9e2eec4a06e70d85bba3c6134da63a078a08ef2dd92ddfcc0e4b1de2fb743ad29cf7f097849ef6f08d5fc1b58e36ab5523ed04445a444ee0a54911edc20dd55b</hash>
<hash type="sha-256">76e7eb3051141e7d8f156bfd23e7a3d57190f71f8260a74c3bf78da75f80b13f</hash>
<hash type="sha-1">e6016ba1f74dc16ea0015343c7f62a2cb2b09ee3</hash>
<hash type="md5">98fdb5f012f691cbb012005390518d7f</hash>
<size>377522012</size>
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-noble/ubuntu-noble.tgz</url>
<version>114.0.0</version>
<version>115.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-noble/usn-log.json</url>
<version>114.0.0</version>
<version>115.0.0</version>
</file>
<generator>metalink-repository-resource/0.0.0</generator>
<published>2026-06-09T00:01:54.936359305Z</published>
<published>2026-06-09T21:42:05.515125161Z</published>
</metalink>
Loading