Skip to content

Commit 2f94914

Browse files
arampricearamprice
committed
Merge branch 'ubuntu-jammy' into manual-merge-jammy2noble
2 parents dfe867b + b8134bc commit 2f94914

6 files changed

Lines changed: 62 additions & 19 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/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
@@ -110,6 +110,24 @@ module Bosh::Stemcell
110110
end
111111
end
112112

113+
describe Infrastructure::Alicloud do
114+
its(:name) { should eq("alicloud") }
115+
its(:hypervisor) { should eq("kvm") }
116+
its(:default_disk_size) { should eq(5120) }
117+
its(:disk_formats) { should eq(["raw"]) }
118+
its(:stemcell_formats) { should eq(["alicloud-raw"]) }
119+
120+
it { should eq Infrastructure.for("alicloud") }
121+
it { should_not eq Infrastructure.for("aws") }
122+
123+
it "has alicloud specific additional cloud properties" do
124+
expect(subject.additional_cloud_properties).to eq({
125+
"root_device_name" => "/dev/vda1",
126+
"nvme_support" => "supported"
127+
})
128+
end
129+
end
130+
113131
describe Infrastructure::Google do
114132
its(:name) { should eq("google") }
115133
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">249ded4a60a3c79c779d3f937de1f4b75a7835e11822dc77caf8d63f2e2bcf5e9561f9f808ff1c125f28f69d8a23824c47272ce9ef322a69bb2bd60ee6045907</hash>
4+
<hash type="sha-256">cd7807961cfd876880627bec561e0f816f1e21e998279b7665aeb77d2395c846</hash>
5+
<hash type="sha-1">9969e43b3aa155e4e5cc0b47b217a94091f59200</hash>
6+
<hash type="md5">a0b7ed840f0f400eb332add85730ce06</hash>
7+
<size>435211053</size>
88
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
9-
<version>1083.0.0</version>
9+
<version>1088.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>1088.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-12T06:00:33.134456831Z</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 devide mapped to the entire disk image
45+
# eg: /dev/loop0
46+
# loopback_dev: device node mapped to the main partition in disk_image
47+
# eg: /dev/mapper/loop0p1
48+
# image_mount_point: place where loopback_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)