X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-pm-mapper.yaml;h=55c5e90db7fb798716c7fb8fd19192f3628110f3;hb=b69272702c17e8217b5d63ea570d20ccf57dd38a;hp=8015e00beda7d9e945bc3b68abf07f7e603d1dbc;hpb=d42d2bef12c64383ef98fed01d11f0c005fa345c;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
old mode 100644
new mode 100755
index 8015e00be..55c5e90db
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,7 +6,9 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
+          java-version: openjdk11
+      - 'frankfurt':
+          branch: 'frankfurt'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
@@ -14,31 +16,39 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
-        mvn-goals: 'clean install'
+        mvn-goals: 'clean install docker:build'
       - '{project-name}-{stream}-merge-java':
         mvn-goals: 'clean deploy'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
-          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'
-          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
+          mvn-goals: 'clean install docker:build docker:push'
 
 - project:
     name: dcaegen2-services-pm-mapper-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-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services/pm-mapper'
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -49,9 +59,10 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/pm-mapper
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
 
 - project:
@@ -59,5 +70,6 @@
     project-name: dcaegen2-services-pm-mapper
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/pm-mapper
     branch: master