From de7d1a2d74b26314f79f5b74550ebe01487bb5c0 Mon Sep 17 00:00:00 2001 From: Bengt Thuree 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 Change-Id: I11105d9ef07c3748f5b2c9c5f82b328eafd00718 --- jjb/so/so-adapters-so-cnf-adapter.yaml | 6 +++--- jjb/so/so-adapters-so-etsi-sol003-adapter.yaml | 8 ++++---- jjb/so/so-adapters-so-etsi-sol005-adapter.yaml | 6 +++--- jjb/so/so-adapters-so-nssmf-adapter.yaml | 6 +++--- jjb/so/so-adapters-so-oof-adapter.yaml | 6 +++--- jjb/so/so-so-admin-cockpit.yaml | 10 +++++----- jjb/so/so-so-etsi-nfvo.yaml | 8 ++++---- jjb/so/so.yaml | 10 +++++----- 8 files changed, 30 insertions(+), 30 deletions(-) (limited to 'jjb/so') diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index f46cc4d3b..e0f1fa141 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -24,7 +24,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' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-cnf-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-cnf-adapter-sonar @@ -56,7 +56,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/adapters/so-cnf-adapter' project-name: 'so-adapters-so-cnf-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index 1c4e5b1c7..86f3f21a6 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -24,7 +24,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' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-etsi-sol003-adapter-sonar @@ -56,7 +56,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/adapters/so-etsi-sol003-adapter' project-name: 'so-adapters-so-etsi-sol003-adapter' branch: 'master' @@ -72,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: 'so/adapters/so-etsi-sol003-adapter' project-name: 'so-adapters-so-etsi-sol003-adapter' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index 398852ff2..2d1a8d545 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -24,7 +24,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' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-etsi-sol005-adapter-sonar @@ -56,7 +56,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/adapters/so-etsi-sol005-adapter' project-name: 'so-adapters-so-etsi-sol005-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 88b6eeca9..d230d005e 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -24,7 +24,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' @@ -45,7 +45,7 @@ mvn-settings: 'so-adapters-so-nssmf-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-nssmf-adapter-sonar @@ -59,7 +59,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/adapters/so-nssmf-adapter' project-name: 'so-adapters-so-nssmf-adapter' branch: 'master' diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index 2fbec6a08..2138fcf9a 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -24,7 +24,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' @@ -42,7 +42,7 @@ mvn-settings: 'so-adapters-so-oof-adapter-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-adapters-so-oof-adapter-sonar @@ -56,7 +56,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/adapters/so-oof-adapter' project-name: 'so-adapters-so-oof-adapter' branch: 'master' diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index ab625623f..7e5614400 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -24,7 +24,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' @@ -42,7 +42,7 @@ mvn-settings: 'so-so-admin-cockpit-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-so-admin-cockpit-sonar @@ -56,7 +56,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/so-admin-cockpit' project-name: 'so-so-admin-cockpit' branch: 'master' @@ -70,7 +70,7 @@ jobs: - 'onap-gerrit-maven-coverity' cron: '@daily' - build-node: 'ubuntu2004-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' project: 'so/so-admin-cockpit' project-name: 'so-so-admin-cockpit' branch: 'master' @@ -101,7 +101,7 @@ nexus-iq-namespace: 'onap-' project: 'so/so-admin-cockpit' project-name: 'so-so-admin-cockpit' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index ee6b43fce..5a54d934a 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -24,7 +24,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' @@ -42,7 +42,7 @@ mvn-settings: 'so-so-etsi-nfvo-settings' files: '**' archive-artifacts: '' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g - project: name: so-so-etsi-nfvo-sonar @@ -56,7 +56,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/so-etsi-nfvo' project-name: 'so-so-etsi-nfvo' branch: 'master' @@ -72,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: 'so/so-etsi-nfvo' project-name: 'so-so-etsi-nfvo' - build-node: ubuntu2004-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g stream: - 'master': branch: 'master' 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