Merge "Chore: Move to ubuntu2004-docker"

8 files changed, 30 insertions, 30 deletions

diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
index e0f1fa141..f46cc4d3b 100644
--- a/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - 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'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-adapters-so-cnf-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-cnf-adapter-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     project: 'so/adapters/so-cnf-adapter'
     project-name: 'so-adapters-so-cnf-adapter'
     branch: 'master'
diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index 86f3f21a6..1c4e5b1c7 100644
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - 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'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-etsi-sol003-adapter-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     project: 'so/adapters/so-etsi-sol003-adapter'
     project-name: 'so-adapters-so-etsi-sol003-adapter'
     branch: 'master'
@@ -72,7 +72,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'so/adapters/so-etsi-sol003-adapter'
     project-name: 'so-adapters-so-etsi-sol003-adapter'
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index 2d1a8d545..398852ff2 100644
--- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - 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'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-etsi-sol005-adapter-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     project: 'so/adapters/so-etsi-sol005-adapter'
     project-name: 'so-adapters-so-etsi-sol005-adapter'
     branch: 'master'
diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index d230d005e..88b6eeca9 100644
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - 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'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -45,7 +45,7 @@
     mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-nssmf-adapter-sonar
@@ -59,7 +59,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     project: 'so/adapters/so-nssmf-adapter'
     project-name: 'so-adapters-so-nssmf-adapter'
     branch: 'master'
diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
index 2138fcf9a..2fbec6a08 100644
--- a/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - 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'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-adapters-so-oof-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-oof-adapter-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     project: 'so/adapters/so-oof-adapter'
     project-name: 'so-adapters-so-oof-adapter'
     branch: 'master'
diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index 7e5614400..ab625623f 100644
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - 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'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-so-admin-cockpit-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
 
 - project:
     name: so-so-admin-cockpit-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     project: 'so/so-admin-cockpit'
     project-name: 'so-so-admin-cockpit'
     branch: 'master'
@@ -70,7 +70,7 @@
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu1804-docker-v1-8c-8g'
+    build-node: 'ubuntu2004-docker-v1-8c-8g'
     project: 'so/so-admin-cockpit'
     project-name: 'so-so-admin-cockpit'
     branch: 'master'
@@ -101,7 +101,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'so/so-admin-cockpit'
     project-name: 'so-so-admin-cockpit'
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index 5a54d934a..ee6b43fce 100644
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - 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'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-so-etsi-nfvo-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
 
 - project:
     name: so-so-etsi-nfvo-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     project: 'so/so-etsi-nfvo'
     project-name: 'so-so-etsi-nfvo'
     branch: 'master'
@@ -72,7 +72,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'so/so-etsi-nfvo'
     project-name: 'so-so-etsi-nfvo'
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 510e10879..716bd6559 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -17,7 +17,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - 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'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -38,7 +38,7 @@
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
 
 - project:
     name: so-sonar
@@ -52,7 +52,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -66,7 +66,7 @@
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu1804-docker-v1-8c-8g'
+    build-node: 'ubuntu2004-docker-v1-8c-8g'
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -97,7 +97,7 @@
     nexus-iq-namespace: 'onap-'
     project: so
     project-name: 'so'
-    build-node: ubuntu1804-docker-v1-8c-8g
+    build-node: ubuntu2004-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'