Merge "Update of SDK for prh to java11"

[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 bff4f47..debd153 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -15,6 +15,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/aai-common'
     stream:
       - 'master':
@@ -31,6 +33,11 @@
     name: aai-aai-common-sonar
     jobs:
       - 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: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
@@ -50,8 +57,8 @@
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
 
@@ -76,12 +83,9 @@
     project-name: 'aai-aai-common'
     project: 'aai/aai-common'
     stream:
-      - 'master-alpine':
+      - 'master':
           branch: 'master'
           distro: 'alpine'
-      - 'master-ubuntu':
-          branch: 'master'
-          distro: 'ubuntu'
     docker_name: 'onap/aai-common-{distro}'
     docker_build_args: '-f ./Dockerfile.{distro}'
     docker_root: '$WORKSPACE/Dockerfiles/aai-common/'
@@ -89,3 +93,15 @@
     mvn-version: 'mvn35'
     files: 'Dockerfiles/aai-common/**'
     build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: 'aai-aai-common-whitesource'
+    project-name: 'aai-aai-common'
+    build-node: ubuntu1604-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-aai-common-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/aai-common'
+    branch: master