From e3df9661c6a556bfaab9e3bda8552c326326d844 Mon Sep 17 00:00:00 2001
From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 3 Nov 2022 10:13:46 +1000
Subject: [PATCH] Feat: Enable SBOM generator for maven-stage jobs

The SBOM generator script now works correctly with
maven-stage jobs in global-jjb. Enable sbom feature
for ODL specific mri stage jobs and distribution.

Change-Id: If70bb9b08e911fafa750e9f9b8777bb08343d75d
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---
 .../distribution/distribution-jobs.yaml       |  1 +
 jjb/lf-infra/zzz-test-release.yaml            |  4 +++-
 jjb/releng-maven-mri-stage.yaml               | 20 +++++++++++++++++++
 jjb/releng-templates-java.yaml                |  4 ++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index a6d755ed68..5a40f97741 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -151,6 +151,7 @@
     name: distribution-release
     jobs:
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
 
     project: "integration/distribution"
diff --git a/jjb/lf-infra/zzz-test-release.yaml b/jjb/lf-infra/zzz-test-release.yaml
index f87f5fe9e6..d979fa26f7 100644
--- a/jjb/lf-infra/zzz-test-release.yaml
+++ b/jjb/lf-infra/zzz-test-release.yaml
@@ -2,7 +2,9 @@
 - project:
     name: "{project-name}-maven-stage-{stream}"
     jobs:
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sbom-generator: true
+
     project: zzz-test-release
     project-name: zzz-test-release
     stream: master
diff --git a/jjb/releng-maven-mri-stage.yaml b/jjb/releng-maven-mri-stage.yaml
index d08c7b4c2a..857cfbf245 100644
--- a/jjb/releng-maven-mri-stage.yaml
+++ b/jjb/releng-maven-mri-stage.yaml
@@ -96,6 +96,10 @@
     mvn-version: mvn35
     ossrh-profile-id: ""
     mvn-pom: ""
+    sbom-flags: ""
+    sbom-path: "$WORKSPACE"
+    sbom-generator: false
+    sbom-generator-version: "v0.0.15"
     sign-artifacts: false
     sign-mode: serial
     stream: master
@@ -145,6 +149,14 @@
           name: STAGING_PROFILE_ID
           default: "{staging-profile-id}"
           description: Nexus staging profile ID.
+      - string:
+          name: SBOM_GENERATOR_VERSION
+          default: "{sbom-generator-version}"
+          description: SBOM generator version to download and run.
+      - string:
+          name: SBOM_PATH
+          default: "{sbom-path}"
+          description: path where SBOM needs to be executed.
 
     builders:
       - lf-infra-pre-build
@@ -166,6 +178,14 @@
       - shell: !include-raw-escape: global-jjb/shell/maven-patch-release.sh
       - lf-maven-build:
           mvn-goals: "{mvn-goals}"
+      # With SBOM Generator
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: "{sbom-generator}"
+          steps:
+            - shell: echo 'Running SBOM Generator'
+            - lf-infra-maven-sbom-generator:
+                sbom-flags: "{sbom-flags}"
       - lf-sigul-sign-dir:
           sign-artifacts: "{sign-artifacts}"
           sign-dir: "$WORKSPACE/m2repo"
diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 3ee731f188..7c3b930997 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -12,9 +12,11 @@
 
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
           cron: ""
 
       - gerrit-maven-mri-stage:
+          sbom-generator: true
           sign-artifacts: true
           cron: ""
 
@@ -33,10 +35,12 @@
           build-timeout: 180
 
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           cron: ""
 
       - gerrit-maven-mri-stage:
+          sbom-generator: true
           sign-artifacts: true
           cron: ""
 
-- 
2.36.6