X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmulticloud%2Fmulticloud-framework-java.yaml;h=b786da67a65866143b111a0066a51adcffcf94fb;hb=2197d45863af3496355dda957fabed01be445a8f;hp=7a17cdb80509447b353743527cf7dc948edd447a;hpb=5201fddb97116aeb77eccd79d7e7ae9a25e2640b;p=ci-management.git

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 7a17cdb80..b786da67a 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -6,6 +6,10 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
     mvn-settings: 'multicloud-framework-settings'
     subproject:
       - 'multivimbroker':
@@ -20,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true
@@ -30,9 +34,11 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-framework-arm64-java
@@ -54,14 +60,19 @@
 #            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: multicloud-framework-multivimbroker-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
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-multivimbroker'
     branch: 'master'
@@ -76,8 +87,10 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: multicloud/framework
-    project-name: 'multicloud-framework-multivimbroker'
-    branch: 'master'
+    project-name: 'multicloud-framework-multivimbroker'   
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-params: '-f multivimbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
 
@@ -85,11 +98,17 @@
     name: multicloud-framework-artifactbroker-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
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
@@ -102,6 +121,11 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/framework
     project-name: 'multicloud-framework-artifactbroker'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'