Merge branch 'oss-ubuntu-jammy' into merge-jammy-to-noble

Author: aramprice

.github/workflows/sbom.yml

@@ -58,13 +58,13 @@ jobs:
       uses: advanced-security/spdx-dependency-submission-action@v0.4.0
 
     - name: Upload Trivy scan results to GitHub Security tab [all]
-      uses: github/codeql-action/upload-sarif@v4.38.2
+      uses: github/codeql-action/upload-sarif@v4.39.1
       with:
         sarif_file: 'trivy-results-all.sarif'
         category: all
 
     - name: Upload Trivy scan results to GitHub Security tab [fix-available]
-      uses: github/codeql-action/upload-sarif@v4.38.2
+      uses: github/codeql-action/upload-sarif@v4.39.1
       with:
         sarif_file: 'trivy-results-with-fix.sarif'
         category: fix-available

bosh-stemcell/lib/bosh/stemcell/stemcell_packager.rb

@@ -44,6 +44,7 @@ def manifest(disk_format)
           "sha1" => image_checksum,
           "operating_system" => "#{definition.operating_system.name}-#{definition.operating_system.version}",
           "stemcell_formats" => infrastructure.stemcell_formats,
+          "agent_features" => [],
           "cloud_properties" => manifest_cloud_properties(disk_format, infrastructure, stemcell_name)
         }
       end

bosh-stemcell/spec/bosh/stemcell/stemcell_packager_spec.rb

@@ -105,6 +105,7 @@ def additional_cloud_properties
         "version" => "1234",
         "bosh_protocol" => 1,
         "api_version" => 3,
+        "agent_features" => [],
         "sha1" => "c1ebdefc3f8282a9d7d47803fb5030b61ffc793d", # SHA-1 of image above
         "operating_system" => "ubuntu-noble",
         "stemcell_formats" => ["stemcell-format-a", "stemcell-format-b"],
@@ -124,6 +125,16 @@ def additional_cloud_properties
       })
     end
 
+    it "includes the agent feature list in the packaged manifest" do
+      packager.package(disk_format)
+
+      manifest = YAML.load_file(File.join(work_dir, "stemcell/stemcell.MF"))
+      expect(manifest["agent_features"]).to eq([])
+      contents, _, status = Open3.capture3("tar", "xOf", File.join(tarball_dir, "bosh-stemcell-1234-fake_infra-fake_hypervisor-ubuntu-jammy-go_agent.tgz"), "stemcell.MF")
+      expect(status.success?).to be(true)
+      expect(YAML.safe_load(contents)["agent_features"]).to eq(manifest["agent_features"])
+    end
+
     it "returns the path of the created tarball" do
       expect(packager.package(disk_format)).to eq(
         File.join(tarball_dir, "bosh-stemcell-1234-fake_infra-fake_hypervisor-ubuntu-noble.tgz")

ci/pipeline-template.yml

@@ -1408,13 +1408,11 @@ resources:
 - name: bosh-cpi-certification-concourse-tasks
   type: git
   source:
-    branch: master
     uri: https://github.com/cloudfoundry/bosh-cpi-certification
 
 - name: bosh-aws-cpi-release
   type: git
   source:
-    branch: master
     ignore_paths:
       - .final_builds/**/*.yml
       - releases/**/*.yml

ci/tasks/light-aws/build.sh

@@ -118,7 +118,7 @@ disk_size_gb=$(mb_to_gb "${BASH_REMATCH[1]}")
 disk_format="${BASH_REMATCH[1]}"
 
 # Make sure we've closed the manifest file before writing to it
-# see https://github.com/cloudfoundry/bosh-aws-light-stemcell-builder/blob/master/ci/docker/Dockerfile#L30
+# see https://github.com/cloudfoundry/bosh-aws-light-stemcell-builder/blob/main/ci/docker/Dockerfile#L30
 light-stemcell-builder \
   -c "${CONFIG_PATH}" \
   --image "${stemcell_image}" \

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">41413688aad1f040c79df97272b05f9f6d167a15499735933b6ad9bb7567af37869af0c3bc7609069ce7e134e76f72a13f0e56362e0899b0cdd0f2c9bba0cf22</hash>
-    <hash type="sha-256">6b96b64c8b2d6cb23270c8419082a2a7ce15a046b32f22e2fdab187001f65127</hash>
-    <hash type="sha-1">8be77a67a5954b612841577e0425cc941e3cd954</hash>
-    <hash type="md5">7e911771431cc1ca29c9f4d2954b394b</hash>
-    <size>438659911</size>
+    <hash type="sha-512">d7867f29cb3db5dc2ed1fc227a6a56d8039d662f659579b475bc56c1f0a770e0fb695e584189e603d2a790db687e6f759693e57928bd5c150741d04852c0a408</hash>
+    <hash type="sha-256">4784e0f8ebba4cdfc9ddb32426fe03afd0bf604694a1fb00f6ef1b6ec0c3ed3f</hash>
+    <hash type="sha-1">06302e3438f1fab2411549bc50c35f536e0647f3</hash>
+    <hash type="md5">2d3997764b428af3a26a86cce14a8cc1</hash>
+    <size>438820903</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
-    <version>1289.0.0</version>
+    <version>1337.0.0</version>
   </file>
   <file name="usn-log.json">
-    <hash type="sha-512">a1d21d6de6e33faf9742b2c91de20f643fede71956621abd3450894859f6ff2546ea69b4bbf1b4ecf262fe802d426d5b67a932db00476ea78b63849d19e0a3f0</hash>
-    <hash type="sha-256">b3dde0ffe3d28ab562b5b26e5b904c7e64bde7b36d534858adca3e99b915c738</hash>
-    <hash type="sha-1">4d7d80ccb74c7f3e026ff5fb8a5d49f59268d62b</hash>
-    <hash type="md5">99f43fe85a7b92b3382547b2eb20718d</hash>
-    <size>81721</size>
+    <hash type="sha-512">c9da43dad07cda9d4a47a4a383f86cf351808710f5d5eb0e5de0a55db43ac1ce39787c564320dec44ec4c350c815f1fb66a4e4bb949124dd6637506d3d791e14</hash>
+    <hash type="sha-256">15de0c714aea8699cd6d014f3631d9080e3d097daeaa1c57a422ecbcd5787d31</hash>
+    <hash type="sha-1">19e2296000a49a4737bf9eb527a62d9014078f5f</hash>
+    <hash type="md5">6521a0709f22a0936c536e01aeb963dc</hash>
+    <size>801</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json</url>
-    <version>1289.0.0</version>
+    <version>1337.0.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-10-12T07:36:17.036131848Z</published>
+  <published>2026-11-03T02:18:57.797464041Z</published>
 </metalink>