X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc.yaml;h=621eac89072e7f878755ea87e6fcd26fa0508b79;hb=f1a0754379362f8edbb63509e9c76df5a03ff0c9;hp=184f6f063b7cb4e42fe977707c8788ed8c3faa62;hpb=e27a43868a8bd014d549e03d93ce7f2764465c63;p=ci-management.git

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 184f6f063..621eac890 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -30,9 +30,9 @@
       - '{project-name}-{stream}-verify-java':
           # this build is unit test only (Verify 1/2)
           mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
-          build-node: 'ubuntu1804-docker-8c-8g'
+          build-node: 'ubuntu2004-docker-8c-8g'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-8c-16g'
+          build-node: 'ubuntu2004-docker-8c-16g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator'
@@ -53,7 +53,7 @@
           maven-versions-plugin: true
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-v1-8c-8g
+          build-node: ubuntu2004-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
           mvn-version: 'mvn36'
@@ -67,13 +67,13 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
           java-version: openjdk11
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     maven-version: 'mvn36'
 
 - project:
@@ -87,7 +87,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-docker-8c-16g
+    build-node: ubuntu2004-docker-8c-16g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
@@ -108,12 +108,12 @@
     nexus-iq-namespace: 'onap-'
     project: sdc
     project-name: 'sdc'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-version: 'mvn36'
     mvn-settings: 'sdc-settings'
     java-version: openjdk11
@@ -130,7 +130,7 @@
 - project:
     name: 'sdc-whitesource'
     project-name: 'sdc'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan:
           build-timeout: 120