X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-bbs-eventprocessor-java.yaml;h=536d7815ae42984768170e9bea54bb15f3151e61;hb=eca9c8f76b895ae08cf8567b67ba9475d84e056e;hp=38741e150d56a7418eec839c26c9084104fa0be8;hpb=484d8c892df57e7f29616e1632a447e12e64edd1;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 38741e150..536d7815a 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -1,11 +1,12 @@
 ---
 - project:
-    name: dcaegen2-services-bbs-event-processor
+    name: dcaegen2-services-bbs-event-processor-verify
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
     subproject:
       - 'bbs-event-processor':
           pom: 'components/bbs-event-processor/pom.xml'
@@ -13,12 +14,16 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
+    maven-version: 'mvn35'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-bbs-event-processor-release
@@ -32,10 +37,11 @@
           version-properties-file: 'components/bbs-event-processor/version.properties'
           mvn-pom: 'components/bbs-event-processor/pom.xml'
           mvn-params: '-f components/bbs-event-processor/pom.xml'
+          mvn-goals: 'clean deploy -Ddockerfile.skip -f components/bbs-event-processor/pom.xml'
           pattern: 'components/bbs-event-processor/**'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
-          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml'
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package -Dmaven.deploy.skip=true dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           pattern: 'components/bbs-event-processor/**'
@@ -43,33 +49,41 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-bbs-event-processor-sonar
+    java-version: openjdk11
     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
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-bbs-event-processor'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
     mvn-params: '-f components/bbs-event-processor/pom.xml'
-    mvn-goals: 'clean install'
+    mvn-goals: 'clean install -Ddockerfile.skip'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     name: dcaegen2-services-bbs-event-processor-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-bbs-event-processor-clm'
     mvn-params: '-f components/bbs-event-processor/pom.xml'