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>

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index a6d755ed6839a036734dd829e0383bcf8e3f6c65..5a40f97741b09fae58351bb22242117e0f181bd4 100644 (file)
--- 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 f87f5fe9e6cf5a0a86b300475245b8d308d5f4cf..d979fa26f7350e68838aa23c706d702db7ae9ca0 100644 (file)
--- 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 d08c7b4c2aadc1b7555769b82f7edbc50f5a7dc3..857cfbf2458d580f3735a74861a6c70186bcd9a6 100644 (file)
--- 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 3ee731f1886ea494194ef70077e7b919779a1765..7c3b930997d7755069fd8ee53a4693b51730e14a 100644 (file)
--- 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: ""