From de7d1a2d74b26314f79f5b74550ebe01487bb5c0 Mon Sep 17 00:00:00 2001
From: Bengt Thuree <bthuree@linuxfoundation.org>
Date: Fri, 30 Sep 2022 00:24:40 +1000
Subject: Chore: Revert back to ubuntu1804-docker

jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-graphadmin.yaml
jjb/aai/aai-graphgraph.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-traversal.yaml
jjb/ccsdk/apps.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
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
jjb/sdc/sdc-sdc-distribution-client.yaml
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-helm-validator.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/so/so-adapters-so-cnf-adapter.yaml
jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
jjb/so/so-adapters-so-nssmf-adapter.yaml
jjb/so/so-adapters-so-oof-adapter.yaml
jjb/so/so-so-admin-cockpit.yaml
jjb/so/so-so-etsi-nfvo.yaml
jjb/so/so.yaml
jjb/vvp/vvp-test-engine.yaml
jjb/vvp/vvp-validation-scripts.yaml

Issue-ID: CIMAN-33
Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org>
Change-Id: I11105d9ef07c3748f5b2c9c5f82b328eafd00718
---
 jjb/so/so.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'jjb/so/so.yaml')

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 716bd6559..510e10879 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: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-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: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-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: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -66,7 +66,7 @@
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu2004-docker-v1-8c-8g'
+    build-node: 'ubuntu1804-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: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
-- 
cgit 1.2.3-korg