Merge "[DCAE] Jobs updated to include istanbul branch"

[ci-management.git] / jjb / sdc / sdc-sdc-distribution-client.yaml

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 2284650..e20b954 100644 (file)
--- 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
+      - 'istanbul':
+          branch: 'istanbul'
+          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:
@@ -69,6 +66,7 @@
     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'
@@ -82,6 +80,7 @@
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-distribution-client-info