Skip to content

Commit 006838e

Browse files
selzocselzoc
committed
Merge branch 'ubuntu-jammy' into ubuntu-noble
2 parents 1aaea3f + 9007667 commit 006838e

11 files changed

Lines changed: 41 additions & 25 deletions

File tree

‎bosh-stemcell/lib/bosh/stemcell/builder_options.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def ovf_options
6161
def environment_variables
6262
{
6363
"UBUNTU_ISO" => environment["UBUNTU_ISO"],
64-
"UBUNTU_MIRROR" => environment["UBUNTU_MIRROR"],
64+
"UBUNTU_DEBOOTSTRAP_MIRROR" => environment["UBUNTU_DEBOOTSTRAP_MIRROR"],
6565
"UBUNTU_ADVANTAGE_TOKEN" => environment["UBUNTU_ADVANTAGE_TOKEN"],
6666
"UBUNTU_FIPS_USE_IAAS_KERNEL" => environment["UBUNTU_FIPS_USE_IAAS_KERNEL"]
6767
}

‎bosh-stemcell/spec/bosh/stemcell/builder_options_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def self.it_sets_correct_environment_variables
6464
let(:env) do
6565
{
6666
"UBUNTU_ISO" => "fake_ubuntu_iso",
67-
"UBUNTU_MIRROR" => "fake_ubuntu_mirror",
67+
"UBUNTU_DEBOOTSTRAP_MIRROR" => "fake_ubuntu_mirror",
6868
"RUBY_BIN" => "fake_ruby_bin"
6969
}
7070
end
@@ -76,7 +76,7 @@ def self.it_sets_correct_environment_variables
7676
expect(result["stemcell_infrastructure"]).to eq(infrastructure.name)
7777
expect(result["stemcell_hypervisor"]).to eq(infrastructure.hypervisor)
7878
expect(result["UBUNTU_ISO"]).to eq("fake_ubuntu_iso")
79-
expect(result["UBUNTU_MIRROR"]).to eq("fake_ubuntu_mirror")
79+
expect(result["UBUNTU_DEBOOTSTRAP_MIRROR"]).to eq("fake_ubuntu_mirror")
8080
expect(result["ruby_bin"]).to eq("fake_ruby_bin")
8181
expect(result["image_create_disk_size"]).to eq(default_disk_size)
8282
expect(result["os_image_tgz"]).to eq("fake/os_image.tgz")

‎bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,10 @@
8383
its(:content) { should match "install floppy /bin/true" }
8484
end
8585
end
86+
87+
context "prevent algif_aead module from being loaded" do
88+
describe file("/etc/modprobe.d/blacklist.conf") do
89+
its(:content) { should match "install algif_aead /bin/true" }
90+
end
91+
end
8692
end

‎ci/pipelines/builder.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ jobs:
248248
params:
249249
OPERATING_SYSTEM_NAME: ubuntu
250250
OPERATING_SYSTEM_VERSION: (@= data.values.stemcell_details.os_short_name @)
251+
UBUNTU_DEBOOTSTRAP_MIRROR: http://mirrors.edge.kernel.org/ubuntu
251252
privileged: true
252253
vars:
253254
image_os_tag: (@= data.values.stemcell_details.os_short_name @)

‎ci/tasks/os-images/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ params:
1919
OPERATING_SYSTEM_VERSION: replace-me
2020
ESM_TOKEN:
2121
UBUNTU_ADVANTAGE_TOKEN:
22+
UBUNTU_DEBOOTSTRAP_MIRROR:

‎image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<metalink xmlns="urn:ietf:params:xml:ns:metalink">
22
<file name="ubuntu-jammy.tgz">
3-
<hash type="sha-512">4d63eb6d8d7eba07628372c969bfdf3a778a66ef77e85616a84f900c603dc53c63c314bb2ded2e073f81e5243507fb3d58ad8f9d84fde0e16bc01f6d2221c616</hash>
4-
<hash type="sha-256">8bf6a4b8a98d71b4c26f41ce4b8622c939de05d82dabdd0ea8e03d44de843db6</hash>
5-
<hash type="sha-1">d21ab0b19c1a3f52bb7e348b69b28663ee676503</hash>
6-
<hash type="md5">f0210c187eb07d66f8ea31f796a4aa76</hash>
7-
<size>434793371</size>
3+
<hash type="sha-512">68d2f0ac85cd492f6c7e23dcac164721d735ae394025a1331bec7e2167cd658bc15fe229af0f2b9eb957519a1a804859b3f2b89faf48542b8dfa6cc6324991c1</hash>
4+
<hash type="sha-256">56ba95d41f6984503e9ca04f104e7c0b358653b72ba1650b7967c608d5a15f16</hash>
5+
<hash type="sha-1">4c863bb345840c4c2686400fdd233321fdbfbc6e</hash>
6+
<hash type="md5">e3bd1cf7e2dc5f37cdf8ede1600ae642</hash>
7+
<size>434854192</size>
88
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
9-
<version>1043.0.0</version>
9+
<version>1046.0.0</version>
1010
</file>
1111
<file name="usn-log.json">
12-
<hash type="sha-512">ca3e99837fae81c10f5522a623fab715b1e430f7895b1f202bae32ccfe3a6f80ad79cffcbd789adcf099de7b00f7cc8c31ebbb3aeb5c0e13aa7decea88bc1559</hash>
13-
<hash type="sha-256">d12b345d3cf6c8127c05e8f702efd18966bf59378830efc14cef784a5248a88e</hash>
14-
<hash type="sha-1">ade2522e3d639fff8df5117dea1870b605ed52a6</hash>
15-
<hash type="md5">6c72c53f5bb8d8d05dd9b377f3beb937</hash>
16-
<size>869</size>
12+
<hash type="sha-512">dfdcf7bff8522d3dd4aa5a1dc46cb68dff60bc961fb78d98326625a9e35049dbbd257e9d70212cabee076366d4b899071395f114139d1a4ec89aabe7cc741051</hash>
13+
<hash type="sha-256">4fad258c0f94d5ad1c9f7bfa3e588d62ce7077b2f4d524021d79667a29c191dc</hash>
14+
<hash type="sha-1">b008c5d31a9edd422fcd78f97a17222bdba30f05</hash>
15+
<hash type="md5">e777c9f1cf0d6ee4797c2f93edd551d3</hash>
16+
<size>2246</size>
1717
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json</url>
18-
<version>1043.0.0</version>
18+
<version>1046.0.0</version>
1919
</file>
2020
<generator>metalink-repository-resource/0.0.0</generator>
21-
<published>2026-04-24T23:46:02.968990444Z</published>
21+
<published>2026-04-30T22:35:40.051014265Z</published>
2222
</metalink>

‎stemcell_builder/lib/prelude_apply.bash‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,23 @@ fi
2222
# Mark /opt/bosh as a safe git repo to avoid "fatal: unsafe repository ('/opt/bosh' is owned by someone else)"
2323
git config --global --add safe.directory /opt/bosh
2424

25+
# Apt retry / timeout options applied to every apt-get invocation during the
26+
# build. Passed via -o so nothing leaks into the resulting OS image, and so
27+
# that flaky upstream mirrors (notably snapshot.ubuntu.com) don't take down
28+
# multi-hour builds on a single transient 503. Acquire::Retries::Delay=true
29+
# enables exponential backoff (apt >= 2.0).
30+
APT_RETRY_OPTS='-o Acquire::Retries=10 -o Acquire::Retries::Delay=true -o Acquire::http::Timeout=120 -o Acquire::https::Timeout=120'
31+
2532
function pkg_mgr {
26-
run_in_chroot $chroot "apt-get update"
27-
run_in_chroot $chroot "export DEBIAN_FRONTEND=noninteractive; apt-get --fix-broken --no-install-recommends --assume-yes $*"
33+
run_in_chroot $chroot "apt-get $APT_RETRY_OPTS update"
34+
run_in_chroot $chroot "export DEBIAN_FRONTEND=noninteractive; apt-get $APT_RETRY_OPTS --fix-broken --no-install-recommends --assume-yes $*"
2835
run_in_chroot $chroot "apt-get clean"
2936
}
3037

3138
# checks if an OS package with the given name exists in the current database of available packages.
3239
# returns 0 if package exists (whether or not is is installed); 1 otherwise
3340
function pkg_exists {
34-
run_in_chroot $chroot "apt-get update"
41+
run_in_chroot $chroot "apt-get $APT_RETRY_OPTS update"
3542
result=`run_in_chroot $chroot "if apt-cache show $1 2>/dev/null >/dev/null; then echo exists; else echo does not exist; fi"`
3643
if [[ "$result" == *"exists"* ]]; then
3744
return 0

‎stemcell_builder/lib/prelude_fips.bash‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
function ua_attach() {
2323
echo "Setting up Ubuntu Advantage ..."
2424

25-
DEBIAN_FRONTEND=noninteractive run_in_chroot ${chroot} "apt-get install --assume-yes ubuntu-pro-client"
25+
DEBIAN_FRONTEND=noninteractive run_in_chroot ${chroot} "apt-get $APT_RETRY_OPTS install --assume-yes ubuntu-pro-client"
2626

2727
run_in_chroot ${chroot} "ua attach --no-auto-enable ${UBUNTU_ADVANTAGE_TOKEN}"
2828
}
@@ -117,7 +117,7 @@ PSUEDO_GRUB_PROBE
117117

118118
function mock_grub_probe() {
119119
# make sure /usr/sbin/grub-probe is installed in the chroot
120-
DEBIAN_FRONTEND=noninteractive run_in_chroot ${chroot} "apt-get install --assume-yes grub-common"
120+
DEBIAN_FRONTEND=noninteractive run_in_chroot ${chroot} "apt-get $APT_RETRY_OPTS install --assume-yes grub-common"
121121
gprobe="${chroot}/usr/sbin/grub-probe"
122122
if [ -f "${gprobe}" ]; then
123123
mv "${gprobe}" "${gprobe}.dist"

‎stemcell_builder/stages/base_debootstrap/apply.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ cleanup_debootstrap() {
7676
}
7777
trap cleanup_debootstrap EXIT
7878

79-
debootstrap --arch="$base_debootstrap_arch" "$base_debootstrap_suite" "$chroot" ""
79+
debootstrap --arch="$base_debootstrap_arch" "$base_debootstrap_suite" "$chroot" "${UBUNTU_DEBOOTSTRAP_MIRROR:-}"
8080

8181
cleanup_debootstrap
8282
trap - EXIT

‎stemcell_builder/stages/base_debootstrap/config.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ then
1313
persist UBUNTU_ISO
1414
fi
1515

16-
if [ ! -z "${UBUNTU_MIRROR:-}" ]
16+
if [ ! -z "${UBUNTU_DEBOOTSTRAP_MIRROR:-}" ]
1717
then
18-
persist UBUNTU_MIRROR
18+
persist UBUNTU_DEBOOTSTRAP_MIRROR
1919
fi
2020

2121
base_debootstrap_arch=amd64

0 commit comments

Comments
 (0)