diff options
author | Bengt Thuree <bthuree@linuxfoundation.org> | 2022-09-30 00:24:40 +1000 |
---|---|---|
committer | Bengt Thuree <bthuree@linuxfoundation.org> | 2022-09-30 00:24:40 +1000 |
commit | de7d1a2d74b26314f79f5b74550ebe01487bb5c0 (patch) | |
tree | 6c6d426c947c1cbb8742ffac993873a125c3491d /jjb/sdc | |
parent | 762d7d841faeaa62f1f842b65888a12bb608aef3 (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/sdc')
-rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 2 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-docker-base.yaml | 6 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-helm-validator.yaml | 6 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-workflow-designer.yaml | 2 | ||||
-rw-r--r-- | jjb/sdc/sdc.yaml | 14 |
5 files changed, 15 insertions, 15 deletions
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 28f4083d2..135ea5dee 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -37,7 +37,7 @@ java-version: openjdk11 jobs: - '{project-name}-{stream}-integration-pairwise' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'sdc/sdc-distribution-client' project-name: 'sdc-sdc-distribution-client' stream: diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index bad80838e..12a33a6d0 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -5,14 +5,14 @@ project-name: 'sdc-sdc-docker-base' jobs: - '{project-name}-{stream}-verify-java': - build-node: 'ubuntu2004-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' docker-pom: 'pom.xml' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'default' - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P default' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index 7bbf0307b..39010d320 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -26,7 +26,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean install docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' @@ -40,7 +40,7 @@ branch: 'master' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: @@ -54,7 +54,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: 'sdc/sdc-helm-validator' project-name: 'sdc-sdc-helm-validator' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index d35635a84..87528eeff 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -17,7 +17,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 621eac890..46b4b79ea 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -30,9 +30,9 @@ - '{project-name}-{stream}-verify-java': # this build is unit test only (Verify 1/2) mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - build-node: 'ubuntu2004-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu2004-docker-8c-16g' + build-node: 'ubuntu1804-docker-8c-16g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator' @@ -53,7 +53,7 @@ maven-versions-plugin: true mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - 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=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' mvn-version: 'mvn36' @@ -73,7 +73,7 @@ mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-version: 'mvn36' - project: @@ -87,7 +87,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu2004-docker-8c-16g + build-node: ubuntu1804-docker-8c-16g project: 'sdc' project-name: 'sdc' branch: 'master' @@ -108,7 +108,7 @@ nexus-iq-namespace: 'onap-' project: sdc project-name: 'sdc' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g stream: - 'master': branch: 'master' @@ -130,7 +130,7 @@ - project: name: 'sdc-whitesource' project-name: 'sdc' - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan: build-timeout: 120 |