Merge branch 'ubuntu-jammy' into ubuntu-noble

Author: Joseph Palermo

README.md

@@ -132,8 +132,8 @@ STEMCELL_IMAGE=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/vsphere-esxi-ubuntu.
 STEMCELL_WORKDIR=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/chroot \
 OS_NAME=ubuntu \
 bundle exec rspec -fd --tag ~exclude_on_vsphere \
-spec/os_image/ubuntu_noble_spec.rb \
-spec/stemcells/ubuntu_noble_spec.rb \
+spec/os_image/ubuntu_spec.rb \
+spec/stemcells/ubuntu_spec.rb \
 spec/stemcells/go_agent_spec.rb \
 spec/stemcells/vsphere_spec.rb \
 spec/stemcells/stig_spec.rb \

bosh-stemcell/lib/bosh/stemcell/build_environment.rb

@@ -141,7 +141,7 @@ def build_time_settings
     end
 
     def operating_system_spec_name
-      "#{operating_system.name}_#{operating_system.version}"
+      "#{operating_system.name}"
     end
 
     def prepare_build_path

bosh-stemcell/spec/assets/dpkg-list-ubuntu-aws-fips.txt

@@ -0,0 +1,14 @@
+fips-initramfs
+kcapi-tools
+libgcrypt20-hmac:amd64
+libkcapi1:amd64
+linux-aws-fips
+linux-aws-fips-headers-5.15
+linux-headers-5.15-aws-fips
+linux-headers-aws-fips
+linux-image-5.15-aws-fips
+linux-image-aws-fips
+linux-image-hmac-5.15-aws-fips
+linux-modules-5.15-aws-fips
+microcode-initrd
+openssl-fips-module-3:amd64