X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc-sdc-tosca.yaml;h=b4c4f8761690400d325a6e30e28033ae1c201ce1;hb=c680515bc20928aa1e3c77f78fcc468c54b5631f;hp=c8aa37de2bccdb0defeaf2c922bfd19a21f3ca29;hpb=5612f9378b8b41a1cd15e2f3e80593a8c1a8103f;p=ci-management.git

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index c8aa37de2..b4c4f8761 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -4,6 +4,7 @@
     project-name: sdc-sdc-tosca
     views:
       - project-view
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-tosca
@@ -22,13 +23,14 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
     maven-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-tosca-sonar
@@ -38,9 +40,9 @@
     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-tosca'
     project-name: 'sdc-sdc-tosca'
     branch: 'master'
@@ -48,6 +50,7 @@
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-tosca-clm
@@ -59,9 +62,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdc-sdc-tosca-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-tosca-info
@@ -71,3 +75,4 @@
     build-node: centos7-builder-2c-1g
     project: sdc/sdc-tosca
     branch: master
+    java-version: openjdk11