From 0a2909d6b644168de0154f96af8f2a3e70bd6be7 Mon Sep 17 00:00:00 2001 From: vv770d Date: Mon, 18 Jul 2022 15:36:55 +0000 Subject: [PATCH] [DCAE] Enable SBOM report instrumentation Added new properties to enable SBOM report generation Change-Id: I74d262ec9844a1c6d87d821fb50b26bc70cdef56 Signed-off-by: vv770d Issue-ID: DCAEGEN2-3225 --- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 1 + jjb/dcaegen2/dcaegen2-collectors-datafile.yaml | 1 + jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 1 + jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 1 + jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml | 2 ++ jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml | 1 + jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 6 ++++++ jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml | 2 ++ jjb/dcaegen2/dcaegen2-services-mapper.yaml | 1 + jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml | 1 + jjb/dcaegen2/dcaegen2-services-prh.yaml | 1 + jjb/dcaegen2/dcaegen2-services-sdk.yaml | 1 + jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml | 2 ++ jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 1 + 14 files changed, 22 insertions(+) diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 06f2439d8..f0c363411 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -16,6 +16,7 @@ container-staging-registry: 'nexus3.onap.org:10003' - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true build-node: centos7-docker-8c-8g maven-versions-plugin: true project: 'dcaegen2/analytics/tca-gen2' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index f8ecadfa5..3bac9d475 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -29,6 +29,7 @@ mvn-goals: 'clean deploy' - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index a78a14bad..35d4eea3a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -31,6 +31,7 @@ build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true build-node: centos7-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy -Ddocker.skip' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 82eaa2eb9..61e8b02d5 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -9,6 +9,7 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml index 26ffa5ff3..fba63753e 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml @@ -10,6 +10,8 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true + sbom-path: 'mod2/helm-generator/' build-node: centos7-builder-4c-4g maven-versions-plugin: true version-properties-file: 'mod2/helm-generator/version.properties' diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index e1a776f83..3bdb7393f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -11,6 +11,7 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 4a4d3d0cd..4b35e7695 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -36,6 +36,8 @@ jobs: - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true + sbom-path: 'components/datalake-handler/' build-node: centos7-builder-4c-4g maven-versions-plugin: true mvn-pom: 'components/datalake-handler/pom.xml' @@ -69,6 +71,8 @@ project-name: 'dcaegen2-services-datalake-handler-admin-ui' jobs: - gerrit-maven-stage: + sbom-generator: true + sbom-path: 'components/datalake-handler/' sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true @@ -103,6 +107,8 @@ project-name: 'dcaegen2-services-datalake-handler-des' jobs: - gerrit-maven-stage: + sbom-generator: true + sbom-path: 'components/datalake-handler/' sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml index 8ff354c0e..df5560fbe 100644 --- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -36,6 +36,8 @@ jobs: - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true + sbom-path: 'components/kpi-computation-ms/' build-node: centos7-docker-8c-8g maven-versions-plugin: true mvn-pom: 'components/kpi-computation-ms/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 272140ece..e6bbdbeb2 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -9,6 +9,7 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index a90e70164..5a0e814a0 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -29,6 +29,7 @@ mvn-goals: 'clean deploy' - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 6e224699e..08078e8b3 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -10,6 +10,7 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 1ac174578..7c63d1945 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -8,6 +8,7 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml index db98a33ed..aed1f2abc 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -35,6 +35,8 @@ jobs: - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true + sbom-path: 'components/slice-analysis-ms/' build-node: centos7-docker-8c-8g maven-versions-plugin: true mvn-pom: 'components/slice-analysis-ms/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index a9c173c2c..d2eb8ee2c 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -8,6 +8,7 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: -- 2.16.6