summaryrefslogtreecommitdiffstats
path: root/jjb/dcaegen2
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/dcaegen2
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/dcaegen2')
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml8
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-datafile.yaml8
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml8
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-restconf.yaml8
4 files changed, 16 insertions, 16 deletions
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index da1d88235..4599e94d6 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -10,7 +10,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-goals: 'clean deploy docker:build -DpushImage'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -37,7 +37,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: dcaegen2-analytics-tca-gen2-sonar
@@ -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: 'dcaegen2/analytics/tca-gen2'
project-name: 'dcaegen2-analytics-tca-gen2'
branch: 'master'
@@ -67,7 +67,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/analytics/tca-gen2
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-analytics-tca-gen2'
stream:
- 'master':
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 750b24aa9..510befec2 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -16,7 +16,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
jobs:
@@ -33,7 +33,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- 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'
mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -48,7 +48,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: 'dcaegen2/collectors/datafile'
project-name: 'dcaegen2-collectors-datafile'
branch: 'master'
@@ -63,7 +63,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/datafile
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-datafile'
stream:
- 'master':
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index c071fb694..bef9324fb 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -18,7 +18,7 @@
archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-maven-verify:
pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
@@ -34,7 +34,7 @@
maven-versions-plugin: true
mvn-goals: 'clean deploy -Ddocker.skip'
- gerrit-maven-docker-stage:
- 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'
mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -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: 'dcaegen2/collectors/hv-ves'
project-name: 'dcaegen2-collectors-hv-ves'
branch: 'master'
@@ -69,7 +69,7 @@
stream:
- 'master':
branch: 'master'
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 27f83c834..54e9b3f81 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -13,7 +13,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- 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'
mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -35,7 +35,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu2004-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
- project:
name: dcaegen2-collectors-restconf-sonar
@@ -48,7 +48,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: 'dcaegen2/collectors/restconf'
project-name: 'dcaegen2-collectors-restconf'
branch: 'master'
@@ -63,7 +63,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/restconf
- build-node: ubuntu2004-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-restconf'
stream:
- 'master':