diff options
108 files changed, 194 insertions, 92 deletions
@@ -66,5 +66,20 @@ committers: company: 'LF' id: 'kevin.sandi' timezone: 'America/Costa_Rica' + - name: 'Matt Watkins' + email: 'mwatkins@linuxfoundation.org' + company: 'LF' + id: 'modeSevenindustrialsolutions' + timezone: 'Europe/London' + - name: 'Thomas Kulik' + email: 'thomas.kulik@telekom.de' + company: 'Deutsche Telekom' + id: 'thmsdt' + timezone: 'Germany/Berlin' + - name: 'Cédric Ollivier' + email: 'cedric.ollivier@orange.com' + company: 'Orange' + id: 'ollivier' + timezone: 'Europe/Paris' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index bca81a1cb..2e8eb009b 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -12,10 +12,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'aai/aai-common' @@ -87,6 +87,7 @@ - '{project-name}-{stream}-verify-docker' - '{project-name}-{stream}-merge-docker' - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index a184d51bf..2905fdffc 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -14,10 +14,11 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 0f938b4c0..2fd4f2855 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -13,10 +13,11 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 1e051ea74..bac59be63 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -13,10 +13,11 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 87f607d1d..cd37af33a 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index d86b6db2d..89925a573 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -14,10 +14,11 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-P docker -B -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 5a4f5e88d..474dc7e11 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -16,10 +16,11 @@ - gerrit-maven-stage: mvn-params: '-DskipTests' sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index e4a7cea1e..2bb012766 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 44925875c..738ecc5a2 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -13,10 +13,11 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 6e3979739..6aedc77bf 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -14,10 +14,11 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 1e2fc21df..68b058d98 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -16,10 +16,11 @@ - gerrit-maven-stage: mvn-params: '-DskipTests' sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: + sbom-generator: true mvn-params: '-P docker -Dmaven.test.skip=true' 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 4383b2b09..e55776bb7 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -30,7 +30,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy -Ddocker.skip' - gerrit-maven-docker-stage: @@ -77,6 +77,6 @@ project-name: dcaegen2-collectors-hv-ves jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/collectors/hv-ves branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index c5dbf971f..af4c1fa3c 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -10,7 +10,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -75,6 +75,6 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/collectors/restconf branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 0460f095d..a02937e5e 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -53,6 +53,6 @@ project-name: dcaegen2-collectors-snmptrap jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/collectors/snmptrap branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index ff4142aec..b3fd43957 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -78,6 +78,6 @@ project-name: dcaegen2-collectors-ves jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/collectors/ves branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index b695e9ea8..6c50f2fda 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -4,6 +4,6 @@ project-name: dcaegen2-collectors jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/collectors branch: master diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index b03484612..6b47e11b0 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -45,6 +45,6 @@ project-name: dcaegen2-deployments jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/deployments branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index bacc87053..1fdace907 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -9,7 +9,7 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -81,6 +81,6 @@ name: dcaegen2-platform-ves-openapi-manager-info project: dcaegen2/platform/ves-openapi-manager project-name: dcaegen2-platform-ves-openapi-manager - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index 23d22ed77..ee8f0f5d6 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -4,7 +4,7 @@ project-name: dcaegen2-platform jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/platform branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 8ad14c889..c6158bd16 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -38,7 +38,7 @@ sign-artifacts: true sbom-generator: true sbom-path: 'components/datalake-handler/' - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'components/datalake-handler/pom.xml' mvn-params: '-f components/datalake-handler/pom.xml' @@ -73,7 +73,7 @@ sbom-generator: true sbom-path: 'components/datalake-handler/' sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'components/datalake-handler/pom.xml' mvn-params: '-f components/datalake-handler/pom.xml' @@ -108,7 +108,7 @@ sbom-generator: true sbom-path: 'components/datalake-handler/' sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'components/datalake-handler/pom.xml' mvn-params: '-f components/datalake-handler/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 0f82463c1..5522f2625 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -58,6 +58,6 @@ project-name: dcaegen2-services-heartbeat jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/services/heartbeat branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 84ffba19c..69392e718 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -10,7 +10,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -73,6 +73,6 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/services/mapper branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 9af26f4eb..508d544b7 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -28,7 +28,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -75,6 +75,6 @@ project-name: dcaegen2-services-pm-mapper jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/services/pm-mapper branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 5f10421b0..d8db0185b 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -8,7 +8,7 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -71,6 +71,6 @@ project-name: dcaegen2-services-prh jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/services/prh branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index ba376a11e..8d01e0e74 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -9,7 +9,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: false - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -26,7 +26,7 @@ nexus-snapshot-repo: 'snapshots' files: '**' archive-artifacts: '' - build-node: 'centos7-docker-8c-8g' + build-node: 'centos8-docker-8c-8g' maven-deploy-properties: | deployAtEnd=true @@ -55,7 +55,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'dcaegen2/services/sdk' project-name: 'dcaegen2-services-sdk' branch: 'master' @@ -70,7 +70,7 @@ - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: dcaegen2/services/sdk - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project-name: 'dcaegen2-services-sdk' stream: - 'master': @@ -82,6 +82,6 @@ project-name: dcaegen2-services-sdk jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/services/sdk branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index 2ebe9e16d..92db626af 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -9,7 +9,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -72,6 +72,6 @@ project-name: dcaegen2-services-son-handler jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/services/son-handler branch: master diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml index 4ff813eba..7949ae983 100644 --- a/jjb/dcaegen2/dcaegen2-services.yaml +++ b/jjb/dcaegen2/dcaegen2-services.yaml @@ -4,7 +4,7 @@ project-name: dcaegen2-services jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/services branch: master - project: diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 83d5546a3..55a5bb443 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -61,7 +61,7 @@ project-name: dcaegen2-utils jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/utils branch: master @@ -74,7 +74,7 @@ # push credentials mvn-settings: dcaegen2-utils-settings # requires centos to sign release - build-node: centos7-builder-2c-1g + build-node: centos8-docker-4c-4g tox-dir: onap-dcae-cbs-docker-client stream: - master: diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index deea0626f..e1f6ca0d6 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -47,6 +47,6 @@ project-name: dcaegen2 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2 branch: master diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 93adf4d0d..dfe1fe93d 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -48,7 +48,7 @@ project-name: demo jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: demo branch: master diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index e76024eba..e2cc2f2ca 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -81,6 +81,6 @@ project-name: dmaap-buscontroller jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/buscontroller branch: master diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 239263a16..d9ecb9826 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -76,6 +76,6 @@ project-name: dmaap-datarouter jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/datarouter branch: master diff --git a/jjb/dmaap/dmaap-kafka-client.yaml b/jjb/dmaap/dmaap-kafka-client.yaml index 298fb3a1d..e933bccfb 100644 --- a/jjb/dmaap/dmaap-kafka-client.yaml +++ b/jjb/dmaap/dmaap-kafka-client.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true cron: '' - '{project-name}-gerrit-release-jobs': @@ -54,6 +54,6 @@ project-name: dmaap-kafka-client jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/kafka11aaf branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 4dc1ad13f..6f70c585c 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true cron: '' - '{project-name}-gerrit-release-jobs': @@ -56,6 +56,6 @@ project-name: dmaap-messagerouter-dmaapclient jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/messagerouter/dmaapclient branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index aaa0b8e2a..30db7f59c 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -80,6 +80,6 @@ project-name: dmaap-messagerouter-messageservice jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/messagerouter/messageservice branch: master diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index ad3cea7e0..856d01750 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -10,6 +10,6 @@ project-name: doc jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: doc branch: master diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 35ef4a2cc..5821aab1c 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -88,6 +88,6 @@ project-name: externalapi-nbi jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: externalapi/nbi branch: master diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index dada9edc1..cb43d2558 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true java-version: openjdk11 sbom-generator: true @@ -64,6 +64,6 @@ project-name: holmes-common jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: holmes/common branch: master diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 6e5682bdf..b9a1d95c1 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true java-version: openjdk11 sbom-generator: true @@ -64,6 +64,6 @@ project-name: holmes-engine-management jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: holmes/engine-management branch: master diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 385721e59..1357f6935 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true java-version: openjdk11 sbom-generator: true @@ -64,6 +64,6 @@ project-name: holmes-rule-management jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: holmes/rule-management branch: master diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml index 5074a0c4c..f290699a5 100644 --- a/jjb/integration/docker/integration-docker-onap-java11.yaml +++ b/jjb/integration/docker/integration-docker-onap-java11.yaml @@ -4,7 +4,7 @@ project-name: integration-docker-onap-java jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: integration/docker/onap-java11 branch: master diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml index 84c8b7240..7723a66d7 100644 --- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml +++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml @@ -28,7 +28,7 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -36,6 +36,6 @@ mvn-params: '-P docker' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy' diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index b73e5f21f..4d6fe876a 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -22,7 +22,7 @@ build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index 2c8584c26..ff8faf24e 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -23,7 +23,7 @@ build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy' 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 4b396e80e..bad080116 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 @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g 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 5a1c2e97a..8cb50d6db 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 @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g 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 282ca4574..cca5dab8c 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 @@ -9,7 +9,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g 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 75e5a028c..8c83a9cea 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 @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index 548a28c0c..2c29f1b37 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -18,7 +18,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sbom-generator: true diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index c7b6db3b0..7d89c3028 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -12,10 +12,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-pom: 'distributions/msb-apigateway/pom.xml' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index e1de86867..e59e9bce6 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -6,10 +6,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index dd7bc75d4..ccaeb328e 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index f4815e910..4217d21fa 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 8ef2bcbe1..59cc20a28 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -17,10 +17,12 @@ pattern: 'artifactbroker/**' jobs: - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-goals: install mvn-params: '-P docker' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 1b59ff8cc..98f207e57 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -13,10 +13,12 @@ pattern: 'vio/**' jobs: - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-goals: install mvn-params: '-P docker' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 4d83ed268..5ab40ed15 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -59,11 +59,13 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: centos8-docker-8c-8g + sbom-generator: true maven-goals: install mvn-params: '-P docker' maven-versions-plugin: true diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index 23af12c9a..c899e0afa 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -10,6 +10,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-version-plugin: true 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 55ea68b7f..9a09775b2 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -38,11 +38,13 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy -P docker' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 0b0ecaaec..adb5158df 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -6,11 +6,13 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-pom: 'pom.xml' diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index c4434f736..3cea16365 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -12,6 +12,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 4616a5731..7aef56947 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -20,12 +20,14 @@ - '{project-name}-{stream}-{subproject}-merge-java': build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index e57a5eadf..46e719f12 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -21,12 +21,14 @@ - '{project-name}-{stream}-{subproject}-merge-java': build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index af713bd0e..94228b788 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -15,11 +15,13 @@ mvn-profile: 'docker' mvn-params: "-P docker" - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 85e765b62..0f6093a10 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -9,11 +9,13 @@ mvn-params: '-P docker' build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml index 36fec99aa..de8ac8e1e 100644 --- a/jjb/policy/policy-clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -4,11 +4,13 @@ project-name: 'policy-clamp' jobs: - gerrit-maven-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g + sbom-generator: true maven-versions-plugin: true sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index b488b1fc5..4fbfc7caa 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index ef6f3fc6c..ef6489116 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -9,11 +9,13 @@ mvn-params: '-P docker' build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index e37c0e962..cae1d4d64 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -10,6 +10,7 @@ mvn-params: "-P docker" build-node: ubuntu1804-docker-8c-8g - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 7a499548c..81559a7c9 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -9,11 +9,13 @@ mvn-profile: 'docker' mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 76ee7afd4..32ebcf725 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -9,11 +9,13 @@ mvn-profile: 'docker' mvn-params: "-P docker" - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index f6843f624..d7951eece 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -9,11 +9,13 @@ mvn-params: '-P docker' build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 9831f1413..e47a33c92 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -9,11 +9,13 @@ mvn-params: '-P docker' build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 092b6ab96..760014a40 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -9,11 +9,13 @@ mvn-params: '-P docker' build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 3df4a959b..057e71243 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 0d2e581b7..4d754619c 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -9,11 +9,13 @@ mvn-params: '-P docker' build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml index 7fc8c4e0c..77a92408f 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -10,7 +10,7 @@ project-name: 'sdc-onap-ui-angular' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'sdc/onap-ui-angular' branch: 'master' diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml index e5d262b13..4770759b9 100644 --- a/jjb/sdc/sdc-onap-ui-common.yaml +++ b/jjb/sdc/sdc-onap-ui-common.yaml @@ -4,7 +4,7 @@ project-name: 'sdc-onap-ui-common' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'sdc/onap-ui-common' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index 88edc50d7..4e05756a8 100644 --- a/jjb/sdc/sdc-sdc-be-common.yaml +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -14,7 +14,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -67,6 +67,6 @@ project-name: sdc-sdc-be-common jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sdc/sdc-be-common branch: master diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index dea96a1da..f393f2259 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -14,7 +14,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -93,6 +93,6 @@ project-name: sdc-sdc-distribution-client jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sdc/sdc-distribution-client branch: master diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index 987790423..d928a19ce 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -9,7 +9,7 @@ name: sdc-sdc-helm-validator-info project: sdc/sdc-helm-validator project-name: sdc-sdc-helm-validator - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -23,7 +23,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 4b77468fb..d2d07dafb 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -4,7 +4,7 @@ project-name: 'sdc-sdc-pubsub' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'sdc/sdc-pubsub' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 5b566b3a3..d9387f4f2 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -15,7 +15,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -72,7 +72,7 @@ project-name: sdc-sdc-tosca jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sdc/sdc-tosca branch: master java-version: openjdk11 diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 68a03fcae..de01ff339 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -15,7 +15,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: sbom-generator: true @@ -82,7 +82,7 @@ project-name: sdc-sdc-workflow-designer jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sdc/sdc-workflow-designer branch: master java-version: openjdk11 diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 2a330ed43..a8b578f9b 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -50,7 +50,7 @@ build-timeout: 90 sign-artifacts: true sbom-generator: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-version: 'mvn36' mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' @@ -126,6 +126,6 @@ project-name: sdc jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sdc branch: master diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index 663656bb2..84ace63a0 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-cnf-adapter-info project: so/adapters/so-cnf-adapter project-name: so-adapters-so-cnf-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index f1578f2b0..37ffeaca3 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index f90c894db..db9f91d8b 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 6e51b8b14..7a45cd93f 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index c59c8ba68..2f5ba19a5 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index c6f2e8a52..2f5c9b0a1 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index 810b7396d..f33d94500 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index 40796c84d..1ce164fbb 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -20,10 +20,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 7f3c1aaab..3ded1b545 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -13,10 +13,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests' diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml index 92cc787c7..0e8699271 100644 --- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -14,10 +14,12 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index ef52d2c94..cb2c81016 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -14,6 +14,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 86dfa309a..3ff14dd69 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -14,6 +14,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 518f73ef2..4f399529d 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -19,6 +19,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 4fc3df1a0..827e072dd 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -21,6 +21,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 5df66c4b6..904430086 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -15,6 +15,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 54509ea25..4773938fe 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -16,6 +16,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 258ae31f2..c9c9b4c8c 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -12,6 +12,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 5d975c437..8a6505b80 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -16,6 +16,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index e7796972b..ea4177a39 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -16,6 +16,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index 24f98c12b..425d489e0 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -11,6 +11,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 1b2dedd2b..25a7b49dc 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index b10c1469f..e04e73082 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -6,11 +6,13 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: centos8-docker-8c-8g + sbom-generator: true maven-versions-plugin: true mvn-goals: 'clean package -Pdocker' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 54cee4a0a..c34c2df80 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true |