X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc-sdc-distribution-client.yaml;h=135ea5deeca1f45f6f9e9cd5223b5417151acd15;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=2284650f5e4b5138dee4f26444d2623538653196;hpb=bcbeb86eb4579e2b94e6763a09e66ca1c6832b9d;p=ci-management.git

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 2284650f5..135ea5dee 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -23,17 +23,14 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'guilin':
-          branch: 'guilin'
-          java-version: openjdk8
-      - 'frankfurt':
-          branch: 'frankfurt'
-          java-version: openjdk8
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-distribution-client-integration-pairwise
@@ -51,7 +48,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
     mvn-params: ' -P integration-pairwise'
 
 - project:
@@ -62,13 +59,14 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'sdc/sdc-distribution-client'
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+    java-version: openjdk11
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
@@ -80,8 +78,13 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/sdc-distribution-client
     project-name: 'sdc-sdc-distribution-client'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-distribution-client-info