summaryrefslogtreecommitdiffstats
path: root/jjb/aai
diff options
context:
space:
mode:
authorBengt Thuree <bthuree@linuxfoundation.org>2022-09-30 00:24:40 +1000
committerBengt Thuree <bthuree@linuxfoundation.org>2022-09-30 00:24:40 +1000
commitde7d1a2d74b26314f79f5b74550ebe01487bb5c0 (patch)
tree6c6d426c947c1cbb8742ffac993873a125c3491d /jjb/aai
parent762d7d841faeaa62f1f842b65888a12bb608aef3 (diff)
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
Diffstat (limited to 'jjb/aai')
-rw-r--r--jjb/aai/aai-aai-common.yaml6
-rw-r--r--jjb/aai/aai-babel.yaml2
-rw-r--r--jjb/aai/aai-graphadmin.yaml2
-rw-r--r--jjb/aai/aai-graphgraph.yaml2
-rw-r--r--jjb/aai/aai-model-loader.yaml4
-rw-r--r--jjb/aai/aai-resources.yaml10
-rw-r--r--jjb/aai/aai-schema-service.yaml2
-rw-r--r--jjb/aai/aai-sparky-be.yaml4
-rw-r--r--jjb/aai/aai-traversal.yaml8
9 files changed, 20 insertions, 20 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index c5f819466..c43e70277 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -88,7 +88,7 @@
- '{project-name}-{stream}-merge-docker'
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
project-name: 'aai-aai-common'
@@ -104,13 +104,13 @@
mvn-settings: 'aai-aai-common-settings'
mvn-version: 'mvn35'
files: 'Dockerfiles/aai-common/**'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
java-version: openjdk8
- project:
name: 'aai-aai-common-whitesource'
project-name: 'aai-aai-common'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-params: '-P spring-boot-2-1'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index df9699e0c..823b7d43c 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -19,7 +19,7 @@
sbom-generator: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index c009f1f2a..12b6efcd4 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -18,7 +18,7 @@
sbom-generator: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 173ffe56b..484c8be59 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -18,7 +18,7 @@
sbom-generator: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 4fd9f9495..bfc961eb0 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -19,7 +19,7 @@
sbom-generator: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -B -Dmaven.test.skip=true'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -87,7 +87,7 @@
- project:
name: 'aai-model-loader-whitesource'
project-name: 'aai-model-loader'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 8b3d49ea3..6ffc4234c 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -10,9 +10,9 @@
project-name: 'aai-resources'
jobs:
- '{project-name}-{stream}-verify-java':
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-{stream}-merge-java':
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
mvn-params: '-DskipTests'
sign-artifacts: true
@@ -21,7 +21,7 @@
sbom-generator: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -50,7 +50,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aai/resources'
project-name: 'aai-resources'
branch: 'master'
@@ -89,7 +89,7 @@
- project:
name: 'aai-resources-whitesource'
project-name: 'aai-resources'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-settings: 'aai-resources-settings'
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index b1ef066dc..8fdaf1187 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -18,7 +18,7 @@
sbom-generator: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index f06e57ed6..a1a5c3352 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -19,7 +19,7 @@
sbom-generator: true
- gerrit-maven-docker-stage:
mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -86,7 +86,7 @@
- project:
name: 'aai-sparky-be-whitesource'
project-name: 'aai-sparky-be'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-whitesource-scan
mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 9a7683911..7273498f1 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -10,9 +10,9 @@
project-name: 'aai-traversal'
jobs:
- '{project-name}-{stream}-verify-java':
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-{stream}-merge-java':
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
mvn-params: '-DskipTests'
sign-artifacts: true
@@ -21,7 +21,7 @@
sbom-generator: true
- gerrit-maven-docker-stage:
mvn-params: '-P docker -Dmaven.test.skip=true'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -49,7 +49,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aai/traversal'
project-name: 'aai-traversal'
branch: 'master'