X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-aai-common.yaml;h=4af6105e28d3fb5d464889ddf601f3983e49c1e5;hb=2197d45863af3496355dda957fabed01be445a8f;hp=4a68af135fc0a0f29cd719cb641b534d4a9f810a;hpb=96a6f2ddbeab9a1af37fafa15a751cd560c86875;p=ci-management.git

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 4a68af135..4af6105e2 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,14 +23,15 @@
       - 'master':
           branch: 'master'
           mvn-params: '-P spring-boot-2-1'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'istanbul':
+          branch: 'istanbul'
           mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk8
 
 - project:
     name: aai-aai-common-sonar
@@ -50,6 +52,7 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+    java-version: openjdk8
 
 - project:
     name: aai-aai-common-clm
@@ -60,18 +63,19 @@
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
     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
 
@@ -91,7 +95,7 @@
       - '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/'
@@ -99,6 +103,7 @@
     mvn-version: 'mvn35'
     files: 'Dockerfiles/aai-common/**'
     build-node: ubuntu1804-docker-8c-8g
+    java-version: openjdk8
 
 - project:
     name: 'aai-aai-common-whitesource'
@@ -112,3 +117,4 @@
     mvn-clean-install: true
     project: 'aai/aai-common'
     branch: master
+    java-version: openjdk8