Remove spdx copying for wear.

riggaroo · riggaroo · commit 457be864b478 · 2025-09-12T08:22:20.000Z
diff --git a/build_presubmit_wear.sh b/build_presubmit_wear.sh
@@ -128,10 +128,6 @@ collect_artifacts() {
   fi
 }
 
-# Copy the app-specific SPDX SBOM
-echo "INFO: Copying SPDX SBOM..."
-cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/wear-release.spdx.json"
-
 # Collect the Wear OS application artifacts
 collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"
 
diff --git a/build_release_wear.sh b/build_release_wear.sh
@@ -125,10 +125,6 @@ collect_artifacts() {
   fi
 }
 
-# Copy the app-specific SPDX SBOM
-echo "INFO: Copying SPDX SBOM..."
-cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/app-release.spdx.json"
-
 # Collect the Wear OS application artifacts
 collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"
 
diff --git a/kokoro/gcp_ubuntu_docker/presubmit_wear.cfg b/kokoro/gcp_ubuntu_docker/presubmit_wear.cfg
@@ -4,7 +4,6 @@ action {
   define_artifacts {
     regex: "artifacts/**.aab"
     regex: "artifacts/**.intoto.jsonl"
-    sbom_regex: "artifacts/app-release.spdx.json"
     strip_prefix: "artifacts"
     fail_if_no_artifacts: true
   }
diff --git a/kokoro/gcp_ubuntu_docker/release_wear.cfg b/kokoro/gcp_ubuntu_docker/release_wear.cfg
@@ -4,7 +4,6 @@ action {
   define_artifacts {
     regex: "artifacts/**.aab"
     regex: "artifacts/**.intoto.jsonl"
-    sbom_regex: "artifacts/app-release.spdx.json"
     strip_prefix: "artifacts"
     fail_if_no_artifacts: true
   }

Original file line number	Diff line number	Diff line change
`@@ -128,10 +128,6 @@ collect_artifacts() {`
`128`	`128`	`fi`
`129`	`129`	`}`
`130`	`130`
`131`		`-# Copy the app-specific SPDX SBOM`
`132`		`-echo "INFO: Copying SPDX SBOM..."`
`133`		`-cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/wear-release.spdx.json"`
`134`		`-`
`135`	`131`	`# Collect the Wear OS application artifacts`
`136`	`132`	`collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"`
`137`	`133`
Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,6 @@ collect_artifacts() {`
`125`	`125`	`fi`
`126`	`126`	`}`
`127`	`127`
`128`		`-# Copy the app-specific SPDX SBOM`
`129`		`-echo "INFO: Copying SPDX SBOM..."`
`130`		`-cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/app-release.spdx.json"`
`131`		`-`
`132`	`128`	`# Collect the Wear OS application artifacts`
`133`	`129`	`collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"`
`134`	`130`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ action {`
`4`	`4`	`define_artifacts {`
`5`	`5`	`regex: "artifacts/**.aab"`
`6`	`6`	`regex: "artifacts/**.intoto.jsonl"`
`7`		`- sbom_regex: "artifacts/app-release.spdx.json"`
`8`	`7`	`strip_prefix: "artifacts"`
`9`	`8`	`fail_if_no_artifacts: true`
`10`	`9`	`}`