From: Jessica Wagantall Date: Mon, 3 Apr 2023 16:52:59 +0000 (+0000) Subject: Merge "Chore: Turn on SBOM for AAI" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=-c;p=ci-management.git Merge "Chore: Turn on SBOM for AAI" --- 627a2bfc1daf1c3b458d46a71bb714f9010cf09a diff --combined jjb/aai/aai-aai-common.yaml index e52ceb98f,a0803d263..2e8eb009b --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@@ -12,10 -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 +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 --combined jjb/aai/aai-babel.yaml index e66bf18a9,d5fe6333f..2905fdffc --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@@ -14,10 -14,11 +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 --combined jjb/aai/aai-graphadmin.yaml index dfa92c6f5,7e3aa81d4..2fd4f2855 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@@ -13,10 -13,11 +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 --combined jjb/aai/aai-graphgraph.yaml index f3ce0922f,6af57f993..bac59be63 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@@ -13,10 -13,11 +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 --combined jjb/aai/aai-model-loader.yaml index d425da51b,11edff8f3..89925a573 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@@ -14,10 -14,11 +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 --combined jjb/aai/aai-resources.yaml index aad11fe55,f6163f44d..474dc7e11 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@@ -16,10 -16,11 +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 --combined jjb/aai/aai-schema-service.yaml index 4f20596c1,00f89a469..738ecc5a2 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@@ -13,10 -13,11 +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 --combined jjb/aai/aai-sparky-be.yaml index 866ff679f,9e363c415..6aedc77bf --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@@ -14,10 -14,11 +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 --combined jjb/aai/aai-traversal.yaml index b8bb13d70,ba1e1112a..68b058d98 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@@ -16,10 -16,11 +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'