Merge "Turning on SBOM generation for SDC"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 5302908..ad0cea2 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -99,6 +99,14 @@
           branch: 'master'
           distro: 'alpine'
           mvn-params: '-P spring-boot-2-1,docker'
+      - 'jakarta':
+          branch: 'jakarta'
+          distro: 'alpine'
+          mvn-params: '-P spring-boot-2-1,docker'
+      - 'kohn':
+          branch: 'kohn'
+          distro: 'alpine'
+          mvn-params: '-P spring-boot-2-1,docker'
     docker_name: 'onap/aai-common-{distro}'
     docker_build_args: '-f ./Dockerfile.{distro}'
     docker_root: '$WORKSPACE/Dockerfiles/aai-common/'

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 0b8c3df..8b72806 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -30,7 +30,7 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-          sbom-generator: false
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 6049052..dc579b6 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -43,7 +43,7 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-          sbom-generator: false
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true