Merge "Chore: Move to ubuntu2004-docker"

diff --combined jjb/sdc/sdc-sdc-distribution-client.yaml
index 135ea5d,530f9f6..28f4083
--- 1/jjb/sdc/sdc-sdc-distribution-client.yaml
--- 2/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@@ -37,7 -37,7 +37,7 @@@
      java-version: openjdk11
      jobs:
         - '{project-name}-{stream}-integration-pairwise'
-     build-node: ubuntu1804-docker-8c-8g
+     build-node: ubuntu2004-docker-8c-8g
      project: 'sdc/sdc-distribution-client'
      project-name: 'sdc-sdc-distribution-client'
      stream:
@@@ -61,7 -61,7 +61,7 @@@
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
      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'

diff --combined jjb/sdc/sdc-sdc-docker-base.yaml
index 12a33a6,7c32448..bad8083
--- 1/jjb/sdc/sdc-sdc-docker-base.yaml
--- 2/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@@ -5,14 -5,14 +5,14 @@@
      project-name: 'sdc-sdc-docker-base'
      jobs:
        - '{project-name}-{stream}-verify-java':
-           build-node: 'ubuntu1804-docker-v1-8c-8g'
+           build-node: 'ubuntu2004-docker-v1-8c-8g'
            docker-pom: 'pom.xml'
        - '{project-name}-{stream}-sdc-merge-java':
-           build-node: 'ubuntu1804-docker-8c-8g'
+           build-node: 'ubuntu2004-docker-8c-8g'
            docker-pom: 'pom.xml'
            mvn-profile: 'default'
        - gerrit-maven-docker-stage:
-           build-node: ubuntu1804-docker-8c-8g
+           build-node: ubuntu2004-docker-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P default'
            container-public-registry: 'nexus3.onap.org:10001'
@@@ -28,7 -28,7 +28,7 @@@
      mvn-settings: 'sdc-sdc-docker-base-settings'
      files: '**'
      archive-artifacts: ''
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      maven-version: 'mvn36'
  
  - project:

diff --combined jjb/sdc/sdc-sdc-workflow-designer.yaml
index 87528ee,c501dd7..d35635a
--- 1/jjb/sdc/sdc-sdc-workflow-designer.yaml
--- 2/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@@ -17,7 -17,7 +17,7 @@@
            build-node: centos7-builder-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
-           build-node: ubuntu1804-docker-8c-8g
+           build-node: ubuntu2004-docker-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -Dmaven.test.skip=true'
            container-public-registry: 'nexus3.onap.org:10001'
@@@ -37,7 -37,7 +37,7 @@@
      archive-artifacts: ''
      docker-pom: 'pom.xml'
      mvn-profile: docker
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      maven-version: 'mvn36'
  
  - project:
@@@ -50,7 -50,7 +50,7 @@@
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
      sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      project: 'sdc/sdc-workflow-designer'
      project-name: 'sdc-sdc-workflow-designer'
      branch: 'master'
@@@ -67,7 -67,7 +67,7 @@@
      nexus-iq-namespace: 'onap-'
      project: sdc/sdc-workflow-designer
      project-name: 'sdc-sdc-workflow-designer'
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      stream:
        - 'master':
            branch: 'master'

diff --combined jjb/sdnc/sdnc-apps.yaml
index 2287a8c,3239953..135973e
--- 1/jjb/sdnc/sdnc-apps.yaml
--- 2/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@@ -10,7 -10,7 +10,7 @@@
      project-name: 'sdnc-apps'
      jobs:
        - gerrit-maven-verify:
-           build-node: ubuntu1804-docker-8c-8g
+           build-node: ubuntu2004-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Ddocker.skip.push=true -Pdocker'
@@@ -24,7 -24,7 +24,7 @@@
            cron: ''
            sbom-generator: true
        - gerrit-maven-docker-stage:
-           build-node: ubuntu1804-docker-8c-8g
+           build-node: ubuntu2004-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Dmaven.test.skip=true -Pdocker'
@@@ -53,7 -53,7 +53,7 @@@
      files: '**'
      archive-artifacts: ''
      maven-version: "mvn38"
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      mvn-snapshot-id: 'ecomp-snapshots'
      nexus-snapshot-repo: 'snapshots'
  
@@@ -67,7 -67,7 +67,7 @@@
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
      sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      project: 'sdnc/apps'
      project-name: 'sdnc-apps'
      branch: 'master'
@@@ -94,7 -94,7 +94,7 @@@
  #    mvn-settings: 'sdnc-apps-settings'
  #    files: '**'
  #    archive-artifacts: ''
- #    build-node: ubuntu1804-docker-arm64-4c-2g
+ #    build-node: ubuntu2004-docker-arm64-4c-2g
  
  - project:
      name: sdnc-apps-clm
@@@ -103,7 -103,7 +103,7 @@@
      nexus-iq-namespace: 'onap-'
      project: sdnc/apps
      project-name: 'sdnc-apps'
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      stream:
        - 'master':
            branch: 'master'

diff --combined jjb/sdnc/sdnc-oam.yaml
index 34666de,c109f45..5749740
--- 1/jjb/sdnc/sdnc-oam.yaml
--- 2/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@@ -15,7 -15,7 +15,7 @@@
            cron: ''
            sbom-generator: true
        - gerrit-maven-docker-stage:
-           build-node: ubuntu1804-docker-8c-8g
+           build-node: ubuntu2004-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker'
@@@ -36,7 -36,7 +36,7 @@@
      mvn-settings: 'sdnc-oam-settings'
      files: '**'
      archive-artifacts: ''
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      shallow-clone: true
      mvn-snapshot-id: 'ecomp-snapshots'
      nexus-snapshot-repo: 'snapshots'
@@@ -57,7 -57,7 +57,7 @@@
  #    mvn-settings: 'sdnc-oam-settings'
  #    files: '**'
  #    archive-artifacts: ''
- #    build-node: ubuntu1804-docker-arm64-4c-2g
+ #    build-node: ubuntu2004-docker-arm64-4c-2g
  
  - project:
      name: sdnc-oam-clm
@@@ -66,7 -66,7 +66,7 @@@
      nexus-iq-namespace: 'onap-'
      project: sdnc/oam
      project-name: 'sdnc-oam'
 -    build-node: ubuntu1804-builder-4c-4g
 +    build-node: ubuntu2004-builder-4c-4g
      stream:
        - 'master':
            branch: 'master'