Merge "Chore: Turn on SBOM for AAI"

[ci-management.git] / jjb / aai / aai-aai-common.yaml

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 0327ce2..2e8eb00 100644 (file)
--- 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: centos7-builder-4c-4g
+          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'
@@ -23,6 +23,9 @@
       - 'master':
           branch: 'master'
           mvn-params: '-P spring-boot-2-1'
+      - 'jakarta':
+          branch: 'jakarta'
+          mvn-params: '-P spring-boot-2-1'
       - 'kohn':
           branch: 'kohn'
           mvn-params: '-P spring-boot-2-1'
@@ -39,7 +42,6 @@
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
@@ -85,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'
@@ -96,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/'