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

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

5e7a1ae75944e02943490751184a2b2301079497
diff --cc jjb/msb/msb-apigateway.yaml
index c7b6db3b0,de2a4608f..7d89c3028
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@@ -12,10 -12,12 +12,12 @@@
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - gerrit-maven-stage:
+           sbom-generator: true
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-8c-8g
            maven-versions-plugin: true
            mvn-pom: 'distributions/msb-apigateway/pom.xml'
diff --cc jjb/msb/msb-discovery.yaml
index e1de86867,5b4447a37..e59e9bce6
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@@ -6,10 -6,12 +6,12 @@@
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - gerrit-maven-stage:
+           sbom-generator: true
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-8c-8g
            maven-versions-plugin: true
            container-public-registry: 'nexus3.onap.org:10001'
diff --cc jjb/msb/msb-java-sdk.yaml
index dd7bc75d4,2101f7cbb..ccaeb328e
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@@ -6,8 -6,9 +6,9 @@@
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - gerrit-maven-stage:
+           sbom-generator: true
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
      project: 'msb/java-sdk'
      stream:
diff --cc jjb/msb/msb-swagger-sdk.yaml
index f4815e910,8fc158929..4217d21fa
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@@ -6,8 -6,9 +6,9 @@@
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - gerrit-maven-stage:
+           sbom-generator: true
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
      project: 'msb/swagger-sdk'
      stream: