Chore: Move to ubuntu2004-docker

jjb/integration/docker/integration-docker-onap-python.yaml
jjb/integration/integration-data-provider.yaml
jjb/integration/integration-docker.yaml
jjb/integration/integration-templates-csit.yaml
jjb/integration/integration-templates-docker.yaml
jjb/integration/integration.yaml
jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
jjb/integration/simulators/integration-core-nssmf-simulator.yaml
jjb/integration/simulators/integration-pnf-simulator.yaml
jjb/integration/simulators/integration-ran-simulator.yaml
jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml

Issue-ID: CIMAN-33
Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org>
Change-Id: I5f0ea439b8a1b7e161c1651cdbf6e133f5e6e9ea

diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml
index f74b5b3..a143963 100644 (file)
--- a/jjb/integration/docker/integration-docker-onap-python.yaml
+++ b/jjb/integration/docker/integration-docker-onap-python.yaml
@@ -60,4 +60,4 @@
     docker-build-args: '-f ./Dockerfile'
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g

diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml
index 3ec66f8..1cb187e 100644 (file)
--- a/jjb/integration/integration-data-provider.yaml
+++ b/jjb/integration/integration-data-provider.yaml
@@ -72,7 +72,7 @@
     docker-name: 'onap/data-provider'
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
 
 - project:
     name: integration-data-provider-release

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 8a4cf0d..59b4f28 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -43,7 +43,7 @@
         # To simplify the references inside tox.ini and tests/settings.py
         docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
         tox
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     build-timeout: 20
     jobs:
       - gerrit-docker-verify

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 95d8fb3..94e40d3 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -4,7 +4,7 @@
     disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
+    build-node: 'ubuntu2004-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
@@ -67,7 +67,7 @@
     disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
+    build-node: 'ubuntu2004-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
@@ -139,7 +139,7 @@
     branch: master
     build-concurrent: false
     build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     build-timeout: 60
     container-public-registry: 'nexus3.onap.org:10001'
     git-url: "$GIT_URL/$PROJECT"

diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index a0fafde..6a1aa3b 100644 (file)
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -3,7 +3,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-merge'
     id: integration-docker-merge
     project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
+    node: 'ubuntu2004-docker-8c-8g'
     docker-image-name: ''
     mvn-goals: 'clean package docker:build docker:push'
 
@@ -65,7 +65,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-verify'
     id: integration-docker-verify
     project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
+    node: 'ubuntu2004-docker-8c-8g'
     docker-image-name: ''
     mvn-goals: 'clean package docker:build'
     post-docker-verify-script: ''
@@ -130,7 +130,7 @@
     id: integration-docker-compose-verify
     project-type: freestyle
     description: 'This job validates Docker Compose based projects'
-    node: 'ubuntu1804-docker-8c-8g'
+    node: 'ubuntu2004-docker-8c-8g'
     docker_root: '$WORKSPACE'
     post_script: ''
     netconf_sim_service_name: ''

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index cb8286d..5f9a406 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -65,7 +65,7 @@
       - 'test-security-sslendpoints':
           path: 'test/security/sslendpoints'
           pattern: '{path}/**'
-          build-node: ubuntu1804-docker-8c-8g
+          build-node: ubuntu2004-docker-8c-8g
           script: |
               #!/bin/bash
               set -ex # Fail build if any setup step fails

diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
index ed7c32e..873371a 100644 (file)
--- a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
+++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
@@ -17,7 +17,7 @@
           branch: 'master'
     mvn-settings: 'integration-simulators-5G-core-nf-simulator-settings'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     subproject:
       - 'AMF':
           path: 'coresim/AMF/'

diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
index 17d3d9b..c34dd84 100644 (file)
--- a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
+++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
@@ -19,7 +19,7 @@
     mvn-settings: 'integration-simulators-A1-policy-enforcement-simulator-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     jobs:
         - '{project-name}-{stream}-verify-java':
             mvn-goals: 'clean install'

diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
index 73a604b..624373c 100644 (file)
--- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
@@ -19,7 +19,7 @@
     maven-deploy-properties: |
         deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     jobs:
         - '{project-name}-{stream}-verify-java':
             mvn-goals: 'clean install'

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index feae0d4..d9fd63f 100644 (file)
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -12,7 +12,7 @@
       maven-deploy-properties: |
           deployAtEnd=true
       archive-artifacts: ''
-      build-node: ubuntu1804-docker-8c-8g
+      build-node: ubuntu2004-docker-8c-8g
       jobs:
           - '{project-name}-{stream}-verify-java':
                 mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true'
@@ -26,7 +26,7 @@
                 maven-versions-plugin: true
                 mvn-goals: 'clean deploy'
           - 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: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -42,7 +42,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu1804-docker-8c-8g
+      build-node: ubuntu2004-docker-8c-8g
       project: integration/simulators/pnf-simulator
       project-name: integration-pnf-simulator
       branch: 'master'

diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 2c8584c..0c1c736 100644 (file)
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -10,7 +10,7 @@
       maven-deploy-properties: |
           deployAtEnd=true
       archive-artifacts: ''
-      build-node: ubuntu1804-docker-8c-8g
+      build-node: ubuntu2004-docker-8c-8g
       jobs:
           - '{project-name}-{stream}-verify-java':
                 mvn-goals: 'clean install'

diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
index ac0c064..9589354 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
@@ -11,7 +11,7 @@
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: 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-goals: 'clean install -P docker -DskipDockerPush=false'
@@ -30,7 +30,7 @@
           deployAtEnd=true
       files: '**'
       archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+      build-node: 'ubuntu2004-docker-8c-8g'
 
 - project:
       name: integration-simulators-nf-simulator-pm-https-server-sonar
@@ -43,7 +43,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu1804-docker-8c-8g
+      build-node: ubuntu2004-docker-8c-8g
       project: 'integration/simulators/nf-simulator/pm-https-server'
       project-name: 'integration-simulators-nf-simulator-pm-https-server'
       branch: 'master'

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index 4caba82..f5ea55c 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -11,7 +11,7 @@
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: 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-goals: 'clean deploy -P docker -DskipDockerPush=false'
@@ -30,7 +30,7 @@
           deployAtEnd=true
       files: '**'
       archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+      build-node: 'ubuntu2004-docker-8c-8g'
 
 - project:
       name: integration-simulators-nf-simulator-avcn-manager-sonar
@@ -43,7 +43,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu1804-docker-8c-8g
+      build-node: ubuntu2004-docker-8c-8g
       project: 'integration/simulators/nf-simulator/avcn-manager'
       project-name: 'integration-simulators-nf-simulator-avcn-manager'
       branch: 'master'

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
index a3345c8..c433532 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
@@ -12,7 +12,7 @@
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: 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-goals: 'clean install -P docker -DskipDockerPush=false'
@@ -31,7 +31,7 @@
           deployAtEnd=true
       files: '**'
       archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+      build-node: 'ubuntu2004-docker-8c-8g'
 
 - project:
       name: integration-simulators-nf-simulator-netconf-server-sonar
@@ -43,7 +43,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu1804-docker-8c-8g
+      build-node: ubuntu2004-docker-8c-8g
       project: 'integration/simulators/nf-simulator/netconf-server'
       project-name: 'integration-simulators-nf-simulator-netconf-server'
       branch: 'master'

diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index 2994573..f18a9bc 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -11,7 +11,7 @@
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: 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-goals: 'clean deploy -P docker -DskipDockerPush=false'
@@ -30,7 +30,7 @@
           deployAtEnd=true
       files: '**'
       archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+      build-node: 'ubuntu2004-docker-8c-8g'
 
 - project:
       name: integration-simulators-nf-simulator-ves-client-sonar
@@ -43,7 +43,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu1804-docker-8c-8g
+      build-node: ubuntu2004-docker-8c-8g
       project: 'integration/simulators/nf-simulator/ves-client'
       project-name: 'integration-simulators-nf-simulator-ves-client'
       branch: 'master'