From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 27 Dec 2023 22:12:13 +0000 (-0800)
Subject: Feat: Allow SBOM to run in docker-maven jobs
X-Git-Tag: v0.89.7^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=058ca43ca02fbc523e52e3895abea80e669f0dad;p=releng%2Fglobal-jjb.git

Feat: Allow SBOM to run in docker-maven jobs

Issue: RELENG-5062
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: Ifd685f1c6266397a0086093fcb3680a02725d999
---

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 00cafd2d..f2693d4b 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -1217,6 +1217,14 @@
             CONTAINER_PUSH_REGISTRY={container-staging-registry}
       - 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/releasenotes/notes/sbom-docker-maven-stage-2411754809edbe33.yaml b/releasenotes/notes/sbom-docker-maven-stage-2411754809edbe33.yaml
new file mode 100644
index 00000000..ac568274
--- /dev/null
+++ b/releasenotes/notes/sbom-docker-maven-stage-2411754809edbe33.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Allow SBOM reports to be generated for docker-maven stage jobs.