Merge branch 'ubuntu-jammy' into manual-merge-jammy2noble

Author: aramprice

.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/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/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">249ded4a60a3c79c779d3f937de1f4b75a7835e11822dc77caf8d63f2e2bcf5e9561f9f808ff1c125f28f69d8a23824c47272ce9ef322a69bb2bd60ee6045907</hash>
+    <hash type="sha-256">cd7807961cfd876880627bec561e0f816f1e21e998279b7665aeb77d2395c846</hash>
+    <hash type="sha-1">9969e43b3aa155e4e5cc0b47b217a94091f59200</hash>
+    <hash type="md5">a0b7ed840f0f400eb332add85730ce06</hash>
+    <size>435211053</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
-    <version>1083.0.0</version>
+    <version>1088.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>1088.0.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-06-10T03:34:35.655940604Z</published>
+  <published>2026-06-12T06:00:33.134456831Z</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 devide mapped to the entire disk image
+#      eg: /dev/loop0
+# loopback_dev: device node mapped to the main partition in disk_image
+#      eg: /dev/mapper/loop0p1
+# image_mount_point: place where loopback_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)