X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-aai-common.yaml;h=bca81a1cb70981fa8915d6a7be4fdd7a320f3267;hb=d4cd214f2d27d88f7c00686baaf89a5eea31aee2;hp=c5f819466f9b5f0bf4e9b10a85f264b66202dd9e;hpb=61a0f59c466bf12a84b8b2b5d0031589bcdadc0d;p=ci-management.git

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index c5f819466..bca81a1cb 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -23,14 +23,17 @@
       - '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'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
 - project:
@@ -39,11 +42,10 @@
       - 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'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     branch: 'master'
@@ -59,14 +61,12 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
         - 'master':
               branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
     mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
@@ -88,7 +88,7 @@
       - '{project-name}-{stream}-merge-docker'
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
     project-name: 'aai-aai-common'
@@ -98,25 +98,19 @@
           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/'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: 'Dockerfiles/aai-common/**'
-    build-node: ubuntu2004-docker-8c-8g
-    java-version: openjdk8
-
-- project:
-    name: 'aai-aai-common-whitesource'
-    project-name: 'aai-aai-common'
-    build-node: ubuntu2004-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
+    build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk8