From 792d4d99c19663d4a7c065d1951ebe016cad7119 Mon Sep 17 00:00:00 2001
From: Stewart X Addison <sxa@redhat.com>
Date: Thu, 16 Nov 2023 12:37:41 +0000
Subject: [PATCH] sbom: Updates to include builder name and CI link

Signed-off-by: Stewart X Addison <sxa@redhat.com>
---
 sbin/build.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sbin/build.sh b/sbin/build.sh
index 64dc87e38..4c8c279e7 100755
--- a/sbin/build.sh
+++ b/sbin/build.sh
@@ -863,6 +863,10 @@ generateSBoM() {
   addSBOMComponentPropertyFromFile "${javaHome}" "${classpath}" "${sbomJson}" "Eclipse Temurin" "OpenJDK Source Commit" "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/metadata/openjdkSource.txt"
   # Add buildRef as JDK Component Property
   addSBOMComponentPropertyFromFile "${javaHome}" "${classpath}" "${sbomJson}" "Eclipse Temurin" "Temurin Build Ref" "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/metadata/buildSource.txt"
+  # Add jenkins job ID as JDK Component Property
+  addSBOMComponentProperty "${javaHome}" "${classpath}" "${sbomJson}" "Eclipse Temurin" "Builder Job Reference" "${BUILD_URL}"
+  # Add jenkins builder (agent/machine name) as JDK Component Property
+  addSBOMComponentProperty "${javaHome}" "${classpath}" "${sbomJson}" "Eclipse Temurin" "Builder Name" "${NODE_NAME}"
 
   # Add build timestamp
   addSBOMComponentProperty "${javaHome}" "${classpath}" "${sbomJson}" "Eclipse Temurin" "Build Timestamp" "${BUILD_CONFIG[BUILD_TIMESTAMP]}"