From: Jessica Wagantall Date: Mon, 3 Apr 2023 16:52:48 +0000 (+0000) Subject: Merge "Chore: Turn on SBOM for SO" X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=13b19334205065b8f1de985af35f8cad62ffdef1 Merge "Chore: Turn on SBOM for SO" --- 13b19334205065b8f1de985af35f8cad62ffdef1 diff --cc jjb/so/so-adapters-so-cnf-adapter.yaml index 456cd9b99,916e37755..84ace63a0 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@@ -20,10 -20,12 +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 --cc jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index f1578f2b0,7a75fcad3..37ffeaca3 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@@ -20,10 -20,12 +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 --cc jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index f90c894db,261a2e21f..db9f91d8b --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@@ -20,10 -20,12 +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 --cc jjb/so/so-adapters-so-nssmf-adapter.yaml index 6e51b8b14,c4c2dc58f..7a45cd93f --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@@ -20,10 -20,12 +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 --cc jjb/so/so-adapters-so-oof-adapter.yaml index c59c8ba68,4e342f4bc..2f5ba19a5 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@@ -20,10 -20,12 +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 --cc jjb/so/so-libs.yaml index c6f2e8a52,da5130ac0..2f5c9b0a1 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@@ -6,8 -6,9 +6,9 @@@ - '{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 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g diff --cc jjb/so/so-so-admin-cockpit.yaml index 810b7396d,8067ca496..f33d94500 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@@ -20,10 -20,12 +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 --cc jjb/so/so-so-etsi-nfvo.yaml index 40796c84d,ee1cd2250..1ce164fbb --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@@ -20,10 -20,12 +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 --cc jjb/so/so.yaml index 7f3c1aaab,6d9e6cb38..3ded1b545 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@@ -13,10 -13,12 +13,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'