From 89fce4becbc9b1860f408a588a63b84a7bc4d071 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 10 Apr 2023 10:34:54 -0700 Subject: Chore: Use a smaller node for release jobs This is in order to save some costs since these jobs do not require a 8c-8g node Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall Change-Id: Id0ec9e33ac4bc1c7c63dbd6bc7671c47aec996fa --- jjb/aai/aai-aai-common.yaml | 2 +- jjb/aai/aai-babel.yaml | 2 +- jjb/aai/aai-graphadmin.yaml | 2 +- jjb/aai/aai-graphgraph.yaml | 2 +- jjb/aai/aai-logging-service.yaml | 2 +- jjb/aai/aai-model-loader.yaml | 2 +- jjb/aai/aai-resources.yaml | 2 +- jjb/aai/aai-rest-client.yaml | 2 +- jjb/aai/aai-schema-service.yaml | 2 +- jjb/aai/aai-sparky-be.yaml | 2 +- jjb/aai/aai-sparky-fe.yaml | 2 +- jjb/aai/aai-traversal.yaml | 2 +- jjb/ccsdk/apps.yaml | 2 +- jjb/ccsdk/ccsdk-oran.yaml | 2 +- jjb/ccsdk/cds.yaml | 4 ++-- jjb/ccsdk/distribution.yaml | 2 +- jjb/ccsdk/features.yaml | 2 +- jjb/ccsdk/parent.yaml | 2 +- jjb/ccsdk/sli.yaml | 2 +- jjb/cli/cli.yaml | 2 +- jjb/cps/cps-cps-tbdmt.yaml | 2 +- jjb/cps/cps-cps-temporal.yaml | 2 +- jjb/cps/cps-ncmp-dmi-plugin.yaml | 2 +- jjb/cps/cps.yaml | 2 +- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 2 +- jjb/dcaegen2/dcaegen2-collectors-datafile.yaml | 2 +- jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 2 +- jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 2 +- jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 2 +- jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 2 +- jjb/dcaegen2/dcaegen2-deployments.yaml | 2 +- jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml | 2 +- jjb/dcaegen2/dcaegen2-platform.yaml | 2 +- jjb/dcaegen2/dcaegen2-services-heartbeat.yaml | 2 +- jjb/dcaegen2/dcaegen2-services-mapper.yaml | 2 +- jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml | 2 +- jjb/dcaegen2/dcaegen2-services-prh.yaml | 2 +- jjb/dcaegen2/dcaegen2-services-sdk.yaml | 2 +- jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 2 +- jjb/dcaegen2/dcaegen2-services.yaml | 2 +- jjb/demo/demo.yaml | 2 +- jjb/dmaap/dmaap-buscontroller.yaml | 2 +- jjb/dmaap/dmaap-datarouter.yaml | 2 +- jjb/dmaap/dmaap-kafka-client.yaml | 2 +- jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml | 2 +- jjb/dmaap/dmaap-messagerouter-messageservice.yaml | 2 +- jjb/externalapi/externalapi-nbi.yaml | 2 +- jjb/holmes/holmes-common.yaml | 2 +- jjb/holmes/holmes-engine-mgt.yaml | 2 +- jjb/holmes/holmes-rule-mgt.yaml | 2 +- jjb/integration/docker/integration-docker-onap-java11.yaml | 2 +- jjb/integration/docker/integration-docker-onap-python.yaml | 2 +- jjb/integration/integration-data-provider.yaml | 2 +- jjb/integration/simulators/integration-core-nssmf-simulator.yaml | 2 +- jjb/integration/simulators/integration-pnf-simulator.yaml | 2 +- jjb/integration/simulators/integration-ran-simulator.yaml | 2 +- .../nf-simulator/integration-pm-https-server-nf-simulator.yaml | 2 +- .../integration-simulators-nf-simulator-avcn-manager.yaml | 2 +- .../integration-simulators-nf-simulator-netconf-server.yaml | 2 +- .../simulators/nf-simulator/integration-ves-client-nf-simulator.yaml | 2 +- jjb/integration/xtesting/integration-xtesting.yaml | 2 +- jjb/modeling/modeling-etsicatalog.yaml | 2 +- jjb/msb/msb-apigateway.yaml | 2 +- jjb/msb/msb-discovery.yaml | 2 +- jjb/multicloud/multicloud-framework-java.yaml | 2 +- jjb/multicloud/multicloud-k8s.yaml | 2 +- jjb/multicloud/multicloud-openstack-vmware-java.yaml | 2 +- jjb/multicloud/multicloud-openstack.yaml | 2 +- jjb/oom-platform-cert-service/oom-platform-cert-service.yaml | 2 +- jjb/oom/oom-consul.yaml | 2 +- jjb/oom/oom-readiness.yaml | 2 +- jjb/oom/oom-registrator.yaml | 2 +- jjb/oparent/oparent.yaml | 2 +- jjb/optf/optf-has.yaml | 2 +- jjb/optf/optf-osdf.yaml | 2 +- jjb/policy/policy-apex-pdp.yaml | 2 +- jjb/policy/policy-api.yaml | 2 +- jjb/policy/policy-clamp.yaml | 2 +- jjb/policy/policy-common.yaml | 2 +- jjb/policy/policy-distribution.yaml | 2 +- jjb/policy/policy-docker-base-common.yaml | 2 +- jjb/policy/policy-drools-applications.yaml | 2 +- jjb/policy/policy-drools-pdp.yaml | 2 +- jjb/policy/policy-gui.yaml | 2 +- jjb/policy/policy-models.yaml | 2 +- jjb/policy/policy-pap.yaml | 2 +- jjb/policy/policy-parent.yaml | 2 +- jjb/policy/policy-xacml-pdp.yaml | 2 +- jjb/sdc/sdc-sdc-be-common.yaml | 2 +- jjb/sdc/sdc-sdc-distribution-client.yaml | 2 +- jjb/sdc/sdc-sdc-helm-validator.yaml | 2 +- jjb/sdc/sdc-sdc-tosca.yaml | 2 +- jjb/sdc/sdc-sdc-workflow-designer.yaml | 2 +- jjb/sdc/sdc.yaml | 2 +- jjb/sdnc/sdnc-apps.yaml | 2 +- jjb/sdnc/sdnc-northbound.yaml | 2 +- jjb/sdnc/sdnc-oam.yaml | 2 +- jjb/so/so-adapters-so-cnf-adapter.yaml | 2 +- jjb/so/so-adapters-so-etsi-sol003-adapter.yaml | 2 +- jjb/so/so-adapters-so-etsi-sol005-adapter.yaml | 2 +- jjb/so/so-adapters-so-nssmf-adapter.yaml | 2 +- jjb/so/so-adapters-so-oof-adapter.yaml | 2 +- jjb/so/so-libs.yaml | 2 +- jjb/so/so-so-admin-cockpit.yaml | 2 +- jjb/so/so-so-etsi-nfvo.yaml | 2 +- jjb/so/so.yaml | 2 +- jjb/testsuite/testsuite.yaml | 2 +- jjb/usecaseui/usecase-ui-intent-analysis.yaml | 2 +- jjb/usecaseui/usecase-ui-nlp.yaml | 2 +- jjb/usecaseui/usecase-ui-server.yaml | 2 +- jjb/usecaseui/usecase-ui.yaml | 2 +- jjb/vfc/vfc-gvnfm-vnflcm-java.yaml | 2 +- jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml | 2 +- jjb/vfc/vfc-gvnfm-vnfres-java.yaml | 2 +- jjb/vfc/vfc-nfvo-db.yaml | 2 +- jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 2 +- jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml | 2 +- jjb/vfc/vfc-nfvo-lcm-java.yaml | 2 +- jjb/vnfsdk/vnfsdk-refrepo.yaml | 2 +- jjb/vnfsdk/vnfsdk-validation.yaml | 2 +- jjb/vvp/vvp-validation-scripts.yaml | 2 +- 121 files changed, 122 insertions(+), 122 deletions(-) diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 2e8eb009b..432b4c0bf 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -17,7 +17,7 @@ build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/aai-common' stream: - 'master': diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 2905fdffc..cb57b6817 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -24,7 +24,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/babel' stream: - 'jakarta': diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 2fd4f2855..442ba233b 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -23,7 +23,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/graphadmin' stream: - 'master': diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index bac59be63..eb9e75fa4 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -23,7 +23,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/graphgraph' stream: - 'master': diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index cd37af33a..18f304976 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/logging-service' stream: - 'jakarta': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 89925a573..c0ca71877 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -24,7 +24,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/model-loader' stream: - 'jakarta': diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 474dc7e11..0ec89a606 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -26,7 +26,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/resources' stream: diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 2bb012766..e6cc863c9 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/rest-client' stream: - 'jakarta': diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 738ecc5a2..497b44d7a 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -23,7 +23,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/schema-service' stream: - 'master': diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 6aedc77bf..2f6a5a91f 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -24,7 +24,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/sparky-be' stream: - 'jakarta': diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 6f3be3890..76942dd2f 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -11,7 +11,7 @@ maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/sparky-fe' stream: - 'jakarta': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 68b058d98..21823ff98 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -26,7 +26,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'aai/traversal' stream: - 'master': diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 423e4af45..42774f918 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -28,7 +28,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g project: 'ccsdk/apps' stream: diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 38171860b..8927add36 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -23,7 +23,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g project: 'ccsdk/oran' stream: - 'master': diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index aaaef80b0..c74288232 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -21,7 +21,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'ccsdk/cds' stream: @@ -79,7 +79,7 @@ # deployAtEnd=true # files: '**' # archive-artifacts: '' -# build-node: centos7-docker-8c-8g +# build-node: centos7-docker-2c-1g # mvn-snapshot-id: 'ecomp-snapshots' # nexus-snapshot-repo: 'snapshots' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index c409ef0ef..de072811e 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -23,7 +23,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g project: 'ccsdk/distribution' stream: diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 60d6f673d..20f24b960 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -15,7 +15,7 @@ cron: '' sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g project: 'ccsdk/features' stream: diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index eedabbea1..9f430e702 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -15,7 +15,7 @@ cron: '' sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index c9efc9099..d755bac25 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -15,7 +15,7 @@ cron: '' sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g project: 'ccsdk/sli' stream: diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index bec379519..6f8fcb032 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -24,7 +24,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - '{project-name}-{stream}-aai-docker-java-daily': pom: 'deployment/docker/pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml index 60b4758b3..ddbd20090 100644 --- a/jjb/cps/cps-cps-tbdmt.yaml +++ b/jjb/cps/cps-cps-tbdmt.yaml @@ -51,7 +51,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g stream: - 'master': branch: 'master' diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml index f2115e245..cf4f66dc1 100644 --- a/jjb/cps/cps-cps-temporal.yaml +++ b/jjb/cps/cps-cps-temporal.yaml @@ -35,7 +35,7 @@ container-public-registry: nexus3.onap.org:10001 container-staging-registry: nexus3.onap.org:10003 - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g stream: - 'master': branch: master diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml index a7835647f..96b1dd467 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -38,7 +38,7 @@ container-public-registry: nexus3.onap.org:10001 container-staging-registry: nexus3.onap.org:10003 - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g stream: - 'master': branch: master diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 78e6303eb..d0a57a1f4 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -51,7 +51,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g stream: - 'master': branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 68d39e926..0878872f5 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -8,7 +8,7 @@ - gerrit-maven-merge: mvn-goals: 'clean install' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g mvn-goals: 'clean deploy docker:build -DpushImage' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 85252e04d..decb7caed 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -31,7 +31,7 @@ build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index e55776bb7..9113d7526 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -26,7 +26,7 @@ - gerrit-maven-merge: mvn-goals: 'clean deploy' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-stage: sign-artifacts: true sbom-generator: true diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index af4c1fa3c..13e8adab8 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -18,7 +18,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/collectors/restconf' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index a02937e5e..c3b7a85cc 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -17,7 +17,7 @@ pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g archive-artifacts: '' container-tag-method: latest nexus-iq-namespace: 'onap-' diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index b3fd43957..9b854eb8c 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -20,7 +20,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/collectors/ves' stream: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 6b47e11b0..484a1fb84 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -9,7 +9,7 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/deployments' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index 1fdace907..655c0b80c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -18,7 +18,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build docker:push' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/platform/ves-openapi-manager' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index ee8f0f5d6..f1940707d 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -14,6 +14,6 @@ mvn-settings: dcaegen2-platform-settings jobs: - '{project-name}-gerrit-release-jobs' - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: dcaegen2/platform branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 5522f2625..0108dc0ca 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -7,7 +7,7 @@ pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/services/heartbeat' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 69392e718..20d1b60f7 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -18,7 +18,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/services/mapper' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 508d544b7..04c7a5f15 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -31,7 +31,7 @@ build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index d8db0185b..c7fb73a6d 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -17,7 +17,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build docker:push' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/services/prh' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 8d01e0e74..111399f62 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -12,7 +12,7 @@ build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/services/sdk' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index 92db626af..59918b849 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -17,7 +17,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean package docker:build -DpushImageTag' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dcaegen2/services/son-handler' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml index 7949ae983..a63c073e1 100644 --- a/jjb/dcaegen2/dcaegen2-services.yaml +++ b/jjb/dcaegen2/dcaegen2-services.yaml @@ -13,6 +13,6 @@ mvn-settings: dcaegen2-services-settings jobs: - '{project-name}-gerrit-release-jobs' - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: dcaegen2/services branch: master diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index dfe1fe93d..40a5ea41b 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -16,7 +16,7 @@ build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'demo' stream: diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index e2cc2f2ca..36a8f0994 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -18,7 +18,7 @@ container-staging-registry: 'nexus3.onap.org:10003' cron: '' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dmaap/buscontroller' stream: - 'master': diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index d9ecb9826..5e4de1c5f 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -13,7 +13,7 @@ container-staging-registry: 'nexus3.onap.org:10003' cron: '' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dmaap/datarouter' stream: - 'master': diff --git a/jjb/dmaap/dmaap-kafka-client.yaml b/jjb/dmaap/dmaap-kafka-client.yaml index e933bccfb..970025010 100644 --- a/jjb/dmaap/dmaap-kafka-client.yaml +++ b/jjb/dmaap/dmaap-kafka-client.yaml @@ -11,7 +11,7 @@ maven-versions-plugin: true cron: '' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dmaap/kafka11aaf' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 6f70c585c..e1965b831 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -11,7 +11,7 @@ maven-versions-plugin: true cron: '' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dmaap/messagerouter/dmaapclient' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 30db7f59c..15780a7d8 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -13,7 +13,7 @@ container-staging-registry: 'nexus3.onap.org:10003' cron: '' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'dmaap/messagerouter/messageservice' stream: - 'master': diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 5821aab1c..d641799de 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -23,7 +23,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'externalapi/nbi' stream: - 'master': diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index cb43d2558..c29769c5b 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -18,7 +18,7 @@ java-version: openjdk11 sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g java-version: openjdk11 project: 'holmes/common' stream: diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index b9a1d95c1..c8ac3bf6e 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -16,7 +16,7 @@ build-node: ubuntu1804-docker-8c-8g java-version: openjdk11 - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g java-version: openjdk11 project: 'holmes/engine-management' stream: diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 1357f6935..9a26bf91e 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -16,7 +16,7 @@ build-node: ubuntu1804-docker-8c-8g java-version: openjdk11 - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g java-version: openjdk11 project: 'holmes/rule-management' stream: diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml index f290699a5..c75c9abd6 100644 --- a/jjb/integration/docker/integration-docker-onap-java11.yaml +++ b/jjb/integration/docker/integration-docker-onap-java11.yaml @@ -43,7 +43,7 @@ mvn-settings: 'integration-settings' jobs: - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - project: name: 'integration-docker-onap-java-docker' diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml index f74b5b3aa..64b059b04 100644 --- a/jjb/integration/docker/integration-docker-onap-python.yaml +++ b/jjb/integration/docker/integration-docker-onap-python.yaml @@ -43,7 +43,7 @@ mvn-settings: 'integration-settings' jobs: - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - project: name: 'integration-docker-onap-python-docker' diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml index 3ec66f8c6..164eb7372 100644 --- a/jjb/integration/integration-data-provider.yaml +++ b/jjb/integration/integration-data-provider.yaml @@ -81,4 +81,4 @@ mvn-settings: 'integration-settings' jobs: - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml index 7723a66d7..8130a6bdb 100644 --- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml +++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml @@ -26,7 +26,7 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-docker-stage: build-node: centos8-docker-8c-8g maven-versions-plugin: true diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index 4d6fe876a..b87757cfe 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -19,7 +19,7 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-8c-8g diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index ff8faf24e..2a9f75b35 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -20,7 +20,7 @@ mvn-goals: 'clean deploy' pom: 'ransim/pom.xml' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-8c-8g diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml index bad080116..299ababfe 100644 --- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml @@ -16,7 +16,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean install -P docker -DskipDockerPush=false' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'integration/simulators/nf-simulator/pm-https-server' stream: diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml index 8cb50d6db..f242ec177 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml @@ -16,7 +16,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean deploy -P docker -DskipDockerPush=false' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'integration/simulators/nf-simulator/avcn-manager' stream: diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml index cca5dab8c..8c21bb621 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml @@ -17,7 +17,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean install -P docker -DskipDockerPush=false' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'integration/simulators/nf-simulator/netconf-server' stream: diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml index 8c83a9cea..3492b1826 100644 --- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml @@ -16,7 +16,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean deploy -P docker -DskipDockerPush=false' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'integration/simulators/nf-simulator/ves-client' stream: diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 8d9e0587f..b87942e67 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -51,7 +51,7 @@ mvn-settings: 'integration-settings' jobs: - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - project: name: 'integration-xtesting-docker' diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index 2c29f1b37..b36003630 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -29,7 +29,7 @@ !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 7d89c3028..314181c03 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -25,7 +25,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'msb/apigateway' stream: - 'master': diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index e59e9bce6..7b9420420 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -19,7 +19,7 @@ mvn-pom: 'distributions/msb-discovery/pom.xml' mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'msb/discovery' stream: - 'master': diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 59cc20a28..82b317a0f 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -34,7 +34,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 0081b4ab6..0e0a25d38 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -18,7 +18,7 @@ script: !include-raw-escape: 'kud-deployment.sh' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'multicloud/k8s' subproject: - validation-scripts: diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 98f207e57..99321a2c5 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -30,7 +30,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 5ab40ed15..ed4a7d25f 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -72,7 +72,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: 'centos8-builder-4c-4g' diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml index 352cda03d..81ffecbb4 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -36,7 +36,7 @@ - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-stage: sbom-generator: true sign-artifacts: true diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml index caff95b2e..843914b77 100644 --- a/jjb/oom/oom-consul.yaml +++ b/jjb/oom/oom-consul.yaml @@ -45,7 +45,7 @@ mvn-settings: 'oom-settings' jobs: - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - project: name: 'oom-consul-docker' diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml index d88533e7d..9ab171190 100644 --- a/jjb/oom/oom-readiness.yaml +++ b/jjb/oom/oom-readiness.yaml @@ -39,7 +39,7 @@ mvn-settings: 'oom-settings' jobs: - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - project: name: 'oom-readiness-docker' diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index adb5158df..e3caeb2c1 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -20,7 +20,7 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-f pom.xml -Dmaven.test.skip=true -P linux,docker' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'oom/registrator' stream: - 'master': diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 3cea16365..2e3df7d8c 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -17,7 +17,7 @@ build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'oparent' stream: diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 7aef56947..c3624ebfd 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -25,7 +25,7 @@ build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-docker-stage: sbom-generator: true build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 46e719f12..8abff0d3a 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -26,7 +26,7 @@ build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - gerrit-maven-docker-stage: sbom-generator: true build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 94228b788..2363bc136 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -28,7 +28,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/apex-pdp' stream: diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 0f6093a10..ad11393e4 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -22,7 +22,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/api' stream: diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml index de8ac8e1e..75b32d74e 100644 --- a/jjb/policy/policy-clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -23,7 +23,7 @@ build-node: ubuntu1804-docker-8c-16g mvn-params: '-P docker' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/clamp' stream: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 4fbfc7caa..222031d67 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -12,7 +12,7 @@ maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/common' stream: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index ef6489116..e91fef856 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -22,7 +22,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/distribution' stream: diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index cae1d4d64..e26f0ec69 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -17,7 +17,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g mvn-settings: 'policy-docker-settings' mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" java-version: openjdk11 diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 81559a7c9..ddc280021 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -22,7 +22,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 32ebcf725..bcdfe4916 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -22,7 +22,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/drools-pdp' stream: diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index d7951eece..dab10cce7 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -22,7 +22,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/gui' stream: diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index e47a33c92..7fd34eabd 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -22,7 +22,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/models' stream: diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 760014a40..458619ad5 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -22,7 +22,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/pap' stream: diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 057e71243..0ca036baa 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -12,7 +12,7 @@ maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/parent' stream: diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 4d754619c..cce8a3bd9 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -22,7 +22,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'policy/xacml-pdp' stream: diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index 4e05756a8..c3364e9bd 100644 --- a/jjb/sdc/sdc-sdc-be-common.yaml +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -17,7 +17,7 @@ build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'sdc/sdc-be-common' stream: - 'master': diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index f393f2259..699820a40 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -17,7 +17,7 @@ build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'sdc/sdc-distribution-client' stream: diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index d928a19ce..66045fc4f 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -34,7 +34,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'sdc/sdc-helm-validator' mvn-settings: 'sdc-sdc-helm-validator-settings' stream: diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index d9387f4f2..7ac3ff908 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -18,7 +18,7 @@ build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'sdc/sdc-tosca' stream: diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index de01ff339..378429606 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -25,7 +25,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g java-version: openjdk11 project: 'sdc/sdc-workflow-designer' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index a8b578f9b..37984544d 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -63,7 +63,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'sdc' stream: diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 65f8d3e04..f2d990ca5 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -31,7 +31,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g project: 'sdnc/apps' stream: diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 48cec0d3b..3472965e4 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -12,7 +12,7 @@ cron: '' sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g project: 'sdnc/northbound' stream: diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 0fe22c557..635d28442 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -22,7 +22,7 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-8g + build-node: centos7-docker-2c-1g project: 'sdnc/oam' stream: - 'master': diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index 84ace63a0..15935c0e6 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -32,7 +32,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so/adapters/so-cnf-adapter' stream: - 'master': diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index 37ffeaca3..33898367e 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -32,7 +32,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so/adapters/so-etsi-sol003-adapter' stream: - 'master': diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index db9f91d8b..6ee65b2ed 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -32,7 +32,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so/adapters/so-etsi-sol005-adapter' stream: - 'master': diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 7a45cd93f..19c371001 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -32,7 +32,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so/adapters/so-nssmf-adapter' stream: - 'master': diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index 2f5ba19a5..b8c86e26d 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -32,7 +32,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so/adapters/so-oof-adapter' stream: - 'master': diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 2f5c9b0a1..d4c4b8f1d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -11,7 +11,7 @@ build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so/libs' stream: - 'master': diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index f33d94500..26070c3ae 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -32,7 +32,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so/so-admin-cockpit' stream: - 'master': diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index 1ce164fbb..a14563713 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -32,7 +32,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so/so-etsi-nfvo' stream: - 'master': diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 3ded1b545..de5c111f2 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -25,7 +25,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'so' stream: - 'master': diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index db3e73034..ae7062f06 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -12,7 +12,7 @@ mvn-settings: 'testsuite-settings' jobs: - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - project: name: testsuite diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml index 0e8699271..87482eef6 100644 --- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -25,7 +25,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g java-version: openjdk11 files: '**' archive-artifacts: '' diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index cb2c81016..1375d1afd 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -22,7 +22,7 @@ mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 3ff14dd69..c30253af3 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -22,7 +22,7 @@ mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 4f399529d..45f939f0f 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -27,7 +27,7 @@ mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 827e072dd..9236810d9 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -32,7 +32,7 @@ !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: centos8-redis-4c-4g diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 904430086..9d4731568 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -26,7 +26,7 @@ !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 4773938fe..c5ab06a95 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -27,7 +27,7 @@ !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index c9c9b4c8c..834293a10 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -23,7 +23,7 @@ !include-raw-escape: 'build-nfvo-db-docker-image.sh' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g - project: diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 8a6505b80..06a4b3527 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -23,7 +23,7 @@ mvn-pom: 'huawei/pom.xml' mvn-params: '-f huawei/pom.xml' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index ea4177a39..ed79326ad 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -29,7 +29,7 @@ !include-raw-escape: 'build-gvnfm-driver-docker-image.sh' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index 425d489e0..884be7a85 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -22,7 +22,7 @@ !include-raw-escape: 'build-nfvo-lcm-docker-image.sh' build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g files: '**' archive-artifacts: '' build-node: centos8-redis-4c-4g diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index e04e73082..ad34dc87b 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -18,7 +18,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'vnfsdk/refrepo' stream: - 'master': diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index c34c2df80..76f1625b8 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -11,7 +11,7 @@ build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g project: 'vnfsdk/validation' stream: - 'master': diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index a1143ffa0..10c369e7a 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -18,7 +18,7 @@ - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g + build-node: centos7-docker-2c-1g docker-pom: 'pom.xml' mvn-profile: 'default' -- cgit 1.2.3-korg