X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-aai-common.yaml;h=2e8eb009b3d806cf5037ac94cbc1b737fc7f98a4;hb=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=ed523fab305ea14f6dfe5cf53cd9b084d543b857;hpb=c8d18eed8c631a3e82c926f864c8f3ea43b8ec4b;p=ci-management.git

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index ed523fab3..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-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,8 +23,11 @@
       - 'master':
           branch: 'master'
           mvn-params: '-P spring-boot-2-1'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+          mvn-params: '-P spring-boot-2-1'
+      - 'kohn':
+          branch: 'kohn'
           mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
@@ -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'
@@ -65,8 +67,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
     mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
@@ -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'
@@ -98,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/'
@@ -106,17 +115,3 @@
     files: 'Dockerfiles/aai-common/**'
     build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk8
-
-- project:
-    name: 'aai-aai-common-whitesource'
-    project-name: 'aai-aai-common'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-params: '-P spring-boot-2-1'
-    mvn-settings: 'aai-aai-common-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/aai-common'
-    branch: master
-    java-version: openjdk8