Ubuntu noble => resolute

.github/pull_request_template.md

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

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

@@ -141,7 +141,10 @@ def initialize
       end
 
       def additional_cloud_properties
-        {"root_device_name" => "/dev/vda1"}
+        {
+          "root_device_name" => "/dev/vda1",
+          "nvme_support" => "supported"
+        }
       end
     end
 

bosh-stemcell/lib/shellout_types/service.rb

@@ -27,7 +27,7 @@ def check_service_enabled(runlevel)
       stdout, stderr, status = @chroot.run("cat", "/etc/*release")
       raise stderr.to_s if status != 0
 
-      raise "Cannot determine Linux distribution: #{stdout}" unless /Ubuntu/.match?(stdout)
+      raise "Cannot determine Linux distribution: #{stdout}" unless /Ubuntu|openSUSE/.match?(stdout)
 
       check_is_enabled_systemctl
     end

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

@@ -92,6 +92,24 @@ module Bosh::Stemcell
     end
   end
 
+  describe Infrastructure::Alicloud do
+    its(:name) { should eq("alicloud") }
+    its(:hypervisor) { should eq("kvm") }
+    its(:default_disk_size) { should eq(5120) }
+    its(:disk_formats) { should eq(["raw"]) }
+    its(:stemcell_formats) { should eq(["alicloud-raw"]) }
+
+    it { should eq Infrastructure.for("alicloud") }
+    it { should_not eq Infrastructure.for("aws") }
+
+    it "has alicloud specific additional cloud properties" do
+      expect(subject.additional_cloud_properties).to eq({
+        "root_device_name" => "/dev/vda1",
+        "nvme_support" => "supported"
+      })
+    end
+  end
+
   describe Infrastructure::Google do
     its(:name) { should eq("google") }
     its(:hypervisor) { should eq("kvm") }

bosh-stemcell/spec/stemcells/aws_spec.rb

@@ -24,6 +24,22 @@
     end
   end
 
+  context "installed by bosh_aws_agent_settings" do
+    describe file("/var/vcap/bosh/agent.json") do
+      it { should be_valid_json_file }
+
+      it "sets InstanceStorageDevicePattern for NVMe instance storage" do
+        config = JSON.parse(subject.content)
+        expect(config.dig("Platform", "Linux", "InstanceStorageDevicePattern")).to eq("/dev/nvme*n1")
+      end
+
+      it "sets InstanceStorageManagedVolumePattern to exclude EBS volumes" do
+        config = JSON.parse(subject.content)
+        expect(config.dig("Platform", "Linux", "InstanceStorageManagedVolumePattern")).to eq("/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_*")
+      end
+    end
+  end
+
   describe "nvme" do
     describe "nvme-id finder" do
       subject { file("/sbin/nvme-id") }

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

@@ -1,22 +1,22 @@
 <metalink xmlns="urn:ietf:params:xml:ns:metalink">
   <file name="ubuntu-jammy.tgz">
-    <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>
+    <hash type="sha-512">b748ba44907447a03a8e161b370795221f94961f42d59684a5d3f5aef3d48aa523dca132825ce1abf983fca1fc96532c2db9bffbcf4d71714bcff63b5026d62f</hash>
+    <hash type="sha-256">a4fff818d92a51015e05337bc3085a06696122f2bff31cdd2053957d99b9ee25</hash>
+    <hash type="sha-1">ab89630e24048ea311a4ee6a2964d3e1998177ed</hash>
+    <hash type="md5">25d8f6bba0a5e43838922b5f704e580d</hash>
+    <size>435207580</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
-    <version>1083.0.0</version>
+    <version>1089.0.0</version>
   </file>
   <file name="usn-log.json">
-    <hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
-    <hash type="sha-256">01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b</hash>
-    <hash type="sha-1">adc83b19e793491b1c6ea0fd8b46cd9f32e592fc</hash>
-    <hash type="md5">68b329da9893e34099c7d8ad5cb9c940</hash>
-    <size>1</size>
+    <hash type="sha-512">04c6305dd88f1f0fdb8c052c3161682a0320751c96e6e5b6bc0b948bd3c0745d250ff57be25a11e69c1cbc1faf49d6e4dbd9f16163ccdc6ee61f6bdb89e13732</hash>
+    <hash type="sha-256">52256f7644d5e043f59cd3799675e5b76577fc57b7ccac248349ec4a382b2643</hash>
+    <hash type="sha-1">17fb83a8835fffe0fa223470bd10451554cf9ca9</hash>
+    <hash type="md5">d6447fb301e142d191d4d2ce0a39ae2b</hash>
+    <size>8289</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json</url>
-    <version>1083.0.0</version>
+    <version>1089.0.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-06-10T03:34:35.655940604Z</published>
+  <published>2026-06-12T19:44:25.082634332Z</published>
 </metalink>

image-metalinks/ubuntu-noble/ubuntu-noble.meta4

@@ -1,22 +1,22 @@
 <metalink xmlns="urn:ietf:params:xml:ns:metalink">
   <file name="ubuntu-noble.tgz">
-    <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>
+    <hash type="sha-512">abaf1e872ab5fae378ba869e97994d26b0c390296abf57f57e1ee32b55c113247174b31daa2e3ebddd7218013ef5e3fb90015ea4e2e253bf57e9104db527b4e7</hash>
+    <hash type="sha-256">235331e441d4594d54a8fa33120091414eef646b20518b8ecb697f84160b7d40</hash>
+    <hash type="sha-1">af7b9a5f1b8a419061d8b48c7d2f63d7721ff542</hash>
+    <hash type="md5">59fd4f46b08051601c69976b106bf6fc</hash>
+    <size>377555609</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-noble/ubuntu-noble.tgz</url>
-    <version>115.0.0</version>
+    <version>120.0.0</version>
   </file>
   <file name="usn-log.json">
-    <hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
-    <hash type="sha-256">01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b</hash>
-    <hash type="sha-1">adc83b19e793491b1c6ea0fd8b46cd9f32e592fc</hash>
-    <hash type="md5">68b329da9893e34099c7d8ad5cb9c940</hash>
-    <size>1</size>
+    <hash type="sha-512">be253863f3ed36a79daa272c9f23f902422486f46fb84114da8dcb42ce48610048cafa8021e0122c8adf468f9f4c81472a1795db6290f8747a4c8cf5bcdeb18c</hash>
+    <hash type="sha-256">6964ac8f84ef68d727fa7f98b7da660f45cdf98ee86d430140157b998e0fb40e</hash>
+    <hash type="sha-1">5d380f950e833f8d143b49a3134a3384cb7354c1</hash>
+    <hash type="md5">b1e24e5bb6d70a57b4d282b948136d67</hash>
+    <size>8523</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-noble/usn-log.json</url>
-    <version>115.0.0</version>
+    <version>120.0.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-06-09T21:42:05.515125161Z</published>
+  <published>2026-06-12T12:04:33.476081292Z</published>
 </metalink>

stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version

@@ -1 +1 @@
-2.852.0
+2.854.0

stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4

@@ -1,49 +1,49 @@
 <metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="bosh-agent-2.852.0-linux-amd64">
-    <hash type="sha-512">332ee5a24befff9b9751abf531eb56824cdf915e009ba766ef14b50c165af23cdc649520aca492cac8db906e30111d8305bf77e348cb65c64f932593d6e4e498</hash>
-    <hash type="sha-256">acc3f514ff57797abd873291d7b3397c7b5e20f8716390d52f137fd53bebbef7</hash>
-    <hash type="sha-1">f9d13300fa816741e0553df1a4445b67961abb2d</hash>
-    <hash type="md5">88820119036d0928875776ca8a4af1e4</hash>
-    <size>22122821</size>
-    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.852.0-linux-amd64</url>
-    <version>2.852.0</version>
+  <file name="bosh-agent-2.854.0-linux-amd64">
+    <hash type="sha-512">60c32b3a0b02fdfe23d4954225b3f102934a1018f2314d567fd7fa5703f4d1357a39045e06866bf030476eb51d3c6b733c2104d149f963f6f791a2df1b19d62e</hash>
+    <hash type="sha-256">ac491b683c1c31cccdfddc0b38dc4c535f20646c1cc10bd4b009441be174e767</hash>
+    <hash type="sha-1">9619886e9d58a3067bb9f28d62692491561ada94</hash>
+    <hash type="md5">48debf1aa8e03b54142ce6812c1ce708</hash>
+    <size>22082723</size>
+    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.854.0-linux-amd64</url>
+    <version>2.854.0</version>
   </file>
-  <file name="bosh-agent-2.852.0-windows-amd64.exe">
-    <hash type="sha-512">fba4a14f78b798c3dcee072f7f9c6a08abf74f0fd5e2612f33dc087b3a21868e33e61ceb39a56c1eed350d6a3bb6a95bfb610de620961c2e3706adb0f36cba6b</hash>
-    <hash type="sha-256">eb9b5f26b9438ece5f4f24b70db46b8222e71b207ec12fca3261bbc24959fdc2</hash>
-    <hash type="sha-1">2ac9da1644c836ab7326a19e42af3586ae998b32</hash>
-    <hash type="md5">1e5d2a1648092cfb73737a2c5d31be30</hash>
-    <size>21970944</size>
-    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.852.0-windows-amd64.exe</url>
-    <version>2.852.0</version>
+  <file name="bosh-agent-2.854.0-windows-amd64.exe">
+    <hash type="sha-512">f89e68eb2e29d914534efaf4191c06c0200ce2d0614bfe154d9a9e7d2818a0ac2c9a9dc962fde80de15acaed55766ef8d2b726a460b3df0c4bca62c7c6f53e7b</hash>
+    <hash type="sha-256">6251ba807a219fa87407f3739922fe5844e56bc8cf6f2b8159696995fe0233f9</hash>
+    <hash type="sha-1">c202613fe2d93cd08d32387b45907abcd9664743</hash>
+    <hash type="md5">68ed8655d6e11d192652b08892aa8985</hash>
+    <size>21927424</size>
+    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.854.0-windows-amd64.exe</url>
+    <version>2.854.0</version>
   </file>
-  <file name="bosh-agent-pipe-2.852.0-windows-amd64.exe">
-    <hash type="sha-512">8d95cbcb1e23ab81cfb884cdcf9f6db2b604623776034a04459a4e0d4372227abb50e370b9fe1eff1c277dc34741e4af0ecb6f9c7d0061b5d08071726f9c8c97</hash>
-    <hash type="sha-256">e87f467c5f0254437dd33aac392c29b5e4c68a78fdff522f10cf569491c263af</hash>
-    <hash type="sha-1">89682658edec43c05b86b0b9fbdda5dc3d4d7b64</hash>
-    <hash type="md5">d7768248330549d65c9b2ff3ea016277</hash>
+  <file name="bosh-agent-pipe-2.854.0-windows-amd64.exe">
+    <hash type="sha-512">35e15074e659a8b4aee6ae63732e094e54cd817df948fc9e032791a633e349c9172c8823b681f2000b16601a06ad14ca8984d08685dd62427fef6a2396604a66</hash>
+    <hash type="sha-256">deff8634b505021d7816adec2fdfddec1e7dff27566409f1188c8117a80d261f</hash>
+    <hash type="sha-1">604007d3ae0b4bde21bf8f137e1a9aff1e64188a</hash>
+    <hash type="md5">0554fbe400f74aacc4d3934a9bec853c</hash>
     <size>9023488</size>
-    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-pipe-2.852.0-windows-amd64.exe</url>
-    <version>2.852.0</version>
+    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-pipe-2.854.0-windows-amd64.exe</url>
+    <version>2.854.0</version>
   </file>
-  <file name="git-sha-2.852.0">
-    <hash type="sha-512">9075fec0295e986aa95bfa9de8bb40e26e0932b05af5e8e666fe35f6c6e21944d5395b4efa047e91b2332d56e751563f13b7a68e7e9f2f8c9b28c82f7d15c7f4</hash>
-    <hash type="sha-256">7f7c0d8e0a7213855d75459be82aa25fea12de33a3539931a324e655fbeb5e69</hash>
-    <hash type="sha-1">6af2c57a4cc2437d26859f49c1c2a6f0672291c8</hash>
-    <hash type="md5">85872b0eae97abb6f174cebf373b4bda</hash>
+  <file name="git-sha-2.854.0">
+    <hash type="sha-512">d39cf9145f19c00dccd07ed0b566661e6821edb137672220e86ecd502292831aed94ca101bb33c389e3e7c5c926a3d9c57e4dacfe08917e7c50974d74e4a6dd9</hash>
+    <hash type="sha-256">6c6958d30f3f5936fb0aca760e25aa086e2a5a92ef15d98892b46af207a43a9f</hash>
+    <hash type="sha-1">a30f0d58703a2e5296639b25d62af882fc7d7513</hash>
+    <hash type="md5">453d5cb300e14cc3ad8c71639a19123b</hash>
     <size>9</size>
-    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/git-sha-2.852.0</url>
-    <version>2.852.0</version>
+    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/git-sha-2.854.0</url>
+    <version>2.854.0</version>
   </file>
-  <file name="service_wrapper-2.852.0.xml">
+  <file name="service_wrapper-2.854.0.xml">
     <hash type="sha-512">fe22cd6fd90ded459b08385497032f2de4022f712dc753dc026ffbc024d3cdd5007f68886f0d4dd8a7832ece138455c3320ce65b72eec054ed3717f6212a7567</hash>
     <hash type="sha-256">a1f4729600504b0cc026ff5e826bb403b43a564780e091d01e0ab7bacb15906a</hash>
     <hash type="sha-1">a5a1e59f6bfaa23bffb85a6647bfbc3df1dbf594</hash>
     <hash type="md5">c0e9e8c1a9510c750742534ba431530b</hash>
     <size>708</size>
-    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/service_wrapper-2.852.0.xml</url>
-    <version>2.852.0</version>
+    <url>https://s3-external-1.amazonaws.com/bosh-agent-binaries/service_wrapper-2.854.0.xml</url>
+    <version>2.854.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-06-02T20:37:38.94033158Z</published>
+  <published>2026-06-11T23:25:36.524053958Z</published>
 </metalink>

stemcell_builder/stages/image_install_grub/apply.sh

@@ -37,6 +37,17 @@ add_on_exit "umount ${image_mount_point}/boot/efi"
 
 # == Guide to variables in this script (all paths are defined relative to the real root dir, not the chroot)
 
+# work: the base working directory outside the chroot
+#      eg: /mnt/stemcells/aws/xen/ubuntu/work/work
+# disk_image: path to the stemcell disk image
+#      eg: /mnt/stemcells/aws/xen/ubuntu/work/work/aws-xen-ubuntu.raw
+# device: path to the loopback device mapped to the entire disk image
+#      eg: /dev/loop0
+# loopback_root_dev: device node mapped to the main partition in disk_image
+#      eg: /dev/mapper/loop0p1
+# image_mount_point: place where loopback_root_dev is mounted as a filesystem
+#      eg: /mnt/stemcells/aws/xen/ubuntu/work/work/mnt
+
 # Generate random password
 random_password=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 16)