X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-aai-common.yaml;h=c43e70277b2d0745f2d62fd6b4375c3d91e518bd;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=5f10f9a5d7da5e7aa37d173ace5e0298e4bb2257;hpb=8cb9edf54e7842373758935c79d2a320f503e7f0;p=ci-management.git

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 5f10f9a5d..c43e70277 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -15,6 +15,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'aai/aai-common'
@@ -22,13 +23,15 @@
       - 'master':
           branch: 'master'
           mvn-params: '-P spring-boot-2-1'
-      - 'elalto':
-          branch: 'elalto'
+      - 'istanbul':
+          branch: 'istanbul'
+          mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
+    java-version: openjdk8
 
 - project:
     name: aai-aai-common-sonar
@@ -40,7 +43,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     branch: 'master'
@@ -49,28 +52,32 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+    java-version: openjdk8
 
 - project:
     name: aai-aai-common-clm
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
     mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
+    java-version: openjdk8
 
 - project:
     name: aai-aai-common-info
     project-name: aai-aai-common
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/aai-common
     branch: master
 
@@ -81,7 +88,7 @@
       - '{project-name}-{stream}-merge-docker'
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu1604-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'
@@ -90,19 +97,20 @@
       - 'master':
           branch: 'master'
           distro: 'alpine'
-          mvn-params: '-P spring-boot-2-1'
+          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: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
+    java-version: openjdk8
 
 - project:
     name: 'aai-aai-common-whitesource'
     project-name: 'aai-aai-common'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-params: '-P spring-boot-2-1'
@@ -111,3 +119,4 @@
     mvn-clean-install: true
     project: 'aai/aai-common'
     branch: master
+    java-version: openjdk8