Skip to content

Commit 16773b2

Browse files
arampricearamprice
authored
Merge pull request #643 from cloudfoundry/ubuntu-noble
Ubuntu noble => resolute
2 parents e89090e + 9d3069e commit 16773b2

8 files changed

Lines changed: 79 additions & 33 deletions

File tree

‎.github/pull_request_template.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ NOTE: this repository uses a "Merge Forward" strategy
22

33
Changes should be made in the earliest applicable branch, and
44
merged forward through subsequent branches.
5-
1. Create a PR into the oldest branch (`ubuntu-<short_name>`)
6-
2. After this PR has been merged create a `merge-to-<next_short_name>` branch
7-
3. Merge `ubuntu-<short_name>` into `merge-to-<next_short_name>`
8-
4. Create a PR to merge `merge-to-<next_short_name>` into `ubuntu-<next_short_name>`
9-
5. Repeat as needed for subsequent branches
5+
1. PR should be created against the oldest stemcell branch, ex: `ubuntu-<short_name-N>`
6+
2. After this PR has been merged create a PR to merge `ubuntu-<short_name-N>` into `ubuntu-<short_name-N+1>`
7+
3. Repeat as needed for subsequent stemcell line branches

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,10 @@ def initialize
141141
end
142142

143143
def additional_cloud_properties
144-
{"root_device_name" => "/dev/vda1"}
144+
{
145+
"root_device_name" => "/dev/vda1",
146+
"nvme_support" => "supported"
147+
}
145148
end
146149
end
147150

‎bosh-stemcell/lib/shellout_types/service.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def check_service_enabled(runlevel)
2727
stdout, stderr, status = @chroot.run("cat", "/etc/*release")
2828
raise stderr.to_s if status != 0
2929

30-
raise "Cannot determine Linux distribution: #{stdout}" unless /Ubuntu/.match?(stdout)
30+
raise "Cannot determine Linux distribution: #{stdout}" unless /Ubuntu|openSUSE/.match?(stdout)
3131

3232
check_is_enabled_systemctl
3333
end

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,24 @@ module Bosh::Stemcell
9292
end
9393
end
9494

95+
describe Infrastructure::Alicloud do
96+
its(:name) { should eq("alicloud") }
97+
its(:hypervisor) { should eq("kvm") }
98+
its(:default_disk_size) { should eq(5120) }
99+
its(:disk_formats) { should eq(["raw"]) }
100+
its(:stemcell_formats) { should eq(["alicloud-raw"]) }
101+
102+
it { should eq Infrastructure.for("alicloud") }
103+
it { should_not eq Infrastructure.for("aws") }
104+
105+
it "has alicloud specific additional cloud properties" do
106+
expect(subject.additional_cloud_properties).to eq({
107+
"root_device_name" => "/dev/vda1",
108+
"nvme_support" => "supported"
109+
})
110+
end
111+
end
112+
95113
describe Infrastructure::Google do
96114
its(:name) { should eq("google") }
97115
its(:hypervisor) { should eq("kvm") }

‎bosh-stemcell/spec/stemcells/aws_spec.rb‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@
2424
end
2525
end
2626

27+
context "installed by bosh_aws_agent_settings" do
28+
describe file("/var/vcap/bosh/agent.json") do
29+
it { should be_valid_json_file }
30+
31+
it "sets InstanceStorageDevicePattern for NVMe instance storage" do
32+
config = JSON.parse(subject.content)
33+
expect(config.dig("Platform", "Linux", "InstanceStorageDevicePattern")).to eq("/dev/nvme*n1")
34+
end
35+
36+
it "sets InstanceStorageManagedVolumePattern to exclude EBS volumes" do
37+
config = JSON.parse(subject.content)
38+
expect(config.dig("Platform", "Linux", "InstanceStorageManagedVolumePattern")).to eq("/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_*")
39+
end
40+
end
41+
end
42+
2743
describe "nvme" do
2844
describe "nvme-id finder" do
2945
subject { file("/sbin/nvme-id") }

‎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">fab1ec89357516ccedd49d3c1a2f9e8db258ce7e69bb158fdd3ea825b3e2556d89606f0bbb5f83117d3b437a955998a346cfda3b0ffdf7797e4941ad4187ed2a</hash>
4-
<hash type="sha-256">119afe900ff3339ae2f7edfd59b19582971f5d1de61e5bba3c269c8ea3233614</hash>
5-
<hash type="sha-1">d7e7142fc0486c0a3b8a5c3b317b47dbb2fd188d</hash>
6-
<hash type="md5">69c8530406c7669f7d99e5d8289a2b6f</hash>
7-
<size>435214502</size>
3+
<hash type="sha-512">b748ba44907447a03a8e161b370795221f94961f42d59684a5d3f5aef3d48aa523dca132825ce1abf983fca1fc96532c2db9bffbcf4d71714bcff63b5026d62f</hash>
4+
<hash type="sha-256">a4fff818d92a51015e05337bc3085a06696122f2bff31cdd2053957d99b9ee25</hash>
5+
<hash type="sha-1">ab89630e24048ea311a4ee6a2964d3e1998177ed</hash>
6+
<hash type="md5">25d8f6bba0a5e43838922b5f704e580d</hash>
7+
<size>435207580</size>
88
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
9-
<version>1083.0.0</version>
9+
<version>1089.0.0</version>
1010
</file>
1111
<file name="usn-log.json">
12-
<hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
13-
<hash type="sha-256">01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b</hash>
14-
<hash type="sha-1">adc83b19e793491b1c6ea0fd8b46cd9f32e592fc</hash>
15-
<hash type="md5">68b329da9893e34099c7d8ad5cb9c940</hash>
16-
<size>1</size>
12+
<hash type="sha-512">04c6305dd88f1f0fdb8c052c3161682a0320751c96e6e5b6bc0b948bd3c0745d250ff57be25a11e69c1cbc1faf49d6e4dbd9f16163ccdc6ee61f6bdb89e13732</hash>
13+
<hash type="sha-256">52256f7644d5e043f59cd3799675e5b76577fc57b7ccac248349ec4a382b2643</hash>
14+
<hash type="sha-1">17fb83a8835fffe0fa223470bd10451554cf9ca9</hash>
15+
<hash type="md5">d6447fb301e142d191d4d2ce0a39ae2b</hash>
16+
<size>8289</size>
1717
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json</url>
18-
<version>1083.0.0</version>
18+
<version>1089.0.0</version>
1919
</file>
2020
<generator>metalink-repository-resource/0.0.0</generator>
21-
<published>2026-06-10T03:34:35.655940604Z</published>
21+
<published>2026-06-12T19:44:25.082634332Z</published>
2222
</metalink>

‎image-metalinks/ubuntu-noble/ubuntu-noble.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-noble.tgz">
3-
<hash type="sha-512">9e2eec4a06e70d85bba3c6134da63a078a08ef2dd92ddfcc0e4b1de2fb743ad29cf7f097849ef6f08d5fc1b58e36ab5523ed04445a444ee0a54911edc20dd55b</hash>
4-
<hash type="sha-256">76e7eb3051141e7d8f156bfd23e7a3d57190f71f8260a74c3bf78da75f80b13f</hash>
5-
<hash type="sha-1">e6016ba1f74dc16ea0015343c7f62a2cb2b09ee3</hash>
6-
<hash type="md5">98fdb5f012f691cbb012005390518d7f</hash>
7-
<size>377522012</size>
3+
<hash type="sha-512">abaf1e872ab5fae378ba869e97994d26b0c390296abf57f57e1ee32b55c113247174b31daa2e3ebddd7218013ef5e3fb90015ea4e2e253bf57e9104db527b4e7</hash>
4+
<hash type="sha-256">235331e441d4594d54a8fa33120091414eef646b20518b8ecb697f84160b7d40</hash>
5+
<hash type="sha-1">af7b9a5f1b8a419061d8b48c7d2f63d7721ff542</hash>
6+
<hash type="md5">59fd4f46b08051601c69976b106bf6fc</hash>
7+
<size>377555609</size>
88
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-noble/ubuntu-noble.tgz</url>
9-
<version>115.0.0</version>
9+
<version>120.0.0</version>
1010
</file>
1111
<file name="usn-log.json">
12-
<hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
13-
<hash type="sha-256">01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b</hash>
14-
<hash type="sha-1">adc83b19e793491b1c6ea0fd8b46cd9f32e592fc</hash>
15-
<hash type="md5">68b329da9893e34099c7d8ad5cb9c940</hash>
16-
<size>1</size>
12+
<hash type="sha-512">be253863f3ed36a79daa272c9f23f902422486f46fb84114da8dcb42ce48610048cafa8021e0122c8adf468f9f4c81472a1795db6290f8747a4c8cf5bcdeb18c</hash>
13+
<hash type="sha-256">6964ac8f84ef68d727fa7f98b7da660f45cdf98ee86d430140157b998e0fb40e</hash>
14+
<hash type="sha-1">5d380f950e833f8d143b49a3134a3384cb7354c1</hash>
15+
<hash type="md5">b1e24e5bb6d70a57b4d282b948136d67</hash>
16+
<size>8523</size>
1717
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-noble/usn-log.json</url>
18-
<version>115.0.0</version>
18+
<version>120.0.0</version>
1919
</file>
2020
<generator>metalink-repository-resource/0.0.0</generator>
21-
<published>2026-06-09T21:42:05.515125161Z</published>
21+
<published>2026-06-12T12:04:33.476081292Z</published>
2222
</metalink>

‎stemcell_builder/stages/image_install_grub/apply.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@ add_on_exit "umount ${image_mount_point}/boot/efi"
3737

3838
# == Guide to variables in this script (all paths are defined relative to the real root dir, not the chroot)
3939

40+
# work: the base working directory outside the chroot
41+
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work
42+
# disk_image: path to the stemcell disk image
43+
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work/aws-xen-ubuntu.raw
44+
# device: path to the loopback device mapped to the entire disk image
45+
# eg: /dev/loop0
46+
# loopback_root_dev: device node mapped to the main partition in disk_image
47+
# eg: /dev/mapper/loop0p1
48+
# image_mount_point: place where loopback_root_dev is mounted as a filesystem
49+
# eg: /mnt/stemcells/aws/xen/ubuntu/work/work/mnt
50+
4051
# Generate random password
4152
random_password=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 16)
4253

0 commit comments

Comments
 (0)