From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 3 Apr 2023 16:52:35 +0000 (+0000)
Subject: Merge "Chore: Turn on SBOM for OPTF"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6343b32a1e48a92a61c92379773975fb2d4d74d1;hp=-c;p=ci-management.git

Merge "Chore: Turn on SBOM for OPTF"
---

6343b32a1e48a92a61c92379773975fb2d4d74d1
diff --combined jjb/optf/optf-has.yaml
index 6ac61f331,2e35a3733..7aef56947
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@@ -20,12 -20,14 +20,14 @@@
        - '{project-name}-{stream}-{subproject}-merge-java':
            build-node: ubuntu1804-docker-8c-8g
        - gerrit-maven-stage:
+           sbom-generator: true
            sign-artifacts: true
 -          build-node: centos7-docker-8c-8g
 +          build-node: centos8-docker-8c-8g
            maven-versions-plugin: true
        - '{project-name}-gerrit-release-jobs':
            build-node: centos7-docker-8c-8g
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-8c-8g
            maven-versions-plugin: true
            container-public-registry: 'nexus3.onap.org:10001'
@@@ -72,6 -74,6 +74,6 @@@
      project-name: optf-has
      jobs:
        - gerrit-info-yaml-verify
 -    build-node: centos7-builder-2c-1g
 +    build-node: centos8-builder-2c-1g
      project: optf/has
      branch: master
diff --combined jjb/optf/optf-osdf.yaml
index 36bd06beb,f29a5ecae..46e719f12
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@@ -21,12 -21,14 +21,14 @@@
        - '{project-name}-{stream}-{subproject}-merge-java':
            build-node: ubuntu1804-docker-8c-8g
        - gerrit-maven-stage:
+           sbom-generator: true
            sign-artifacts: true
 -          build-node: centos7-docker-8c-8g
 +          build-node: centos8-docker-8c-8g
            maven-versions-plugin: true
        - '{project-name}-gerrit-release-jobs':
            build-node: centos7-docker-8c-8g
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-8c-8g
            maven-versions-plugin: true
            container-public-registry: 'nexus3.onap.org:10001'
@@@ -73,6 -75,6 +75,6 @@@
      project-name: optf-osdf
      jobs:
        - gerrit-info-yaml-verify
 -    build-node: centos7-builder-2c-1g
 +    build-node: centos8-builder-2c-1g
      project: optf/osdf
      branch: master