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

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

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index e52ceb98f..2e8eb009b 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -12,10 +12,10 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'aai/aai-common'
@@ -87,6 +87,7 @@
       - '{project-name}-{stream}-verify-docker'
       - '{project-name}-{stream}-merge-docker'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index e66bf18a9..2905fdffc 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -18,6 +18,7 @@
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index dfa92c6f5..2fd4f2855 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -17,6 +17,7 @@
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index f3ce0922f..bac59be63 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -17,6 +17,7 @@
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index d425da51b..89925a573 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -18,6 +18,7 @@
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -B -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index aad11fe55..474dc7e11 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -20,6 +20,7 @@
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 4f20596c1..738ecc5a2 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -17,6 +17,7 @@
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 866ff679f..6aedc77bf 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -18,6 +18,7 @@
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index b8bb13d70..68b058d98 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -20,6 +20,7 @@
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'