Merge "Remove elalto sdnc Jenkins jobs"

[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 1125ec2..5f10f9a 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -12,12 +12,16 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          build-node: ubuntu1604-builder-4c-4g
+          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':
           branch: 'master'
+          mvn-params: '-P spring-boot-2-1'
       - 'elalto':
           branch: 'elalto'
     mvn-settings: 'aai-aai-common-settings'
@@ -30,11 +34,17 @@
     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'
     project-name: 'aai-aai-common'
     branch: 'master'
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -49,8 +59,9 @@
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'master':
+          branch: 'master'
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
 
@@ -59,6 +70,7 @@
     project-name: aai-aai-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/aai-common
     branch: master
 
@@ -75,12 +87,10 @@
     project-name: 'aai-aai-common'
     project: 'aai/aai-common'
     stream:
-      - 'master-alpine':
+      - 'master':
           branch: 'master'
           distro: 'alpine'
-      - 'master-ubuntu':
-          branch: 'master'
-          distro: 'ubuntu'
+          mvn-params: '-P spring-boot-2-1'
     docker_name: 'onap/aai-common-{distro}'
     docker_build_args: '-f ./Dockerfile.{distro}'
     docker_root: '$WORKSPACE/Dockerfiles/aai-common/'
@@ -92,8 +102,10 @@
 - project:
     name: 'aai-aai-common-whitesource'
     project-name: 'aai-aai-common'
+    build-node: ubuntu1604-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