From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 3 Apr 2023 16:53:08 +0000 (+0000)
Subject: Merge "Chore: Turn on SBOM for VFC"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4494c8d3ecb8fab909b37f6831e27d266d66e10d;p=ci-management.git

Merge "Chore: Turn on SBOM for VFC"
---

4494c8d3ecb8fab909b37f6831e27d266d66e10d
diff --cc jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 4fc3df1a0,86eb6f498..827e072dd
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@@ -21,8 -21,9 +21,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'
diff --cc jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 5df66c4b6,56045f645..904430086
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@@ -15,8 -15,9 +15,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'
diff --cc jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 54509ea25,116966f81..4773938fe
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@@ -16,8 -16,9 +16,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'
diff --cc jjb/vfc/vfc-nfvo-db.yaml
index 258ae31f2,1c7781cb8..c9c9b4c8c
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@@ -12,8 -12,9 +12,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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'
diff --cc jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 5d975c437,789c14906..8a6505b80
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@@ -16,8 -16,9 +16,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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
            mvn-pom: 'huawei/pom.xml'
            mvn-params: '-f huawei/pom.xml'
diff --cc jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index e7796972b,2ecbde18b..ea4177a39
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@@ -16,8 -16,9 +16,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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
            mvn-pom: 'gvnfmadapter/pom.xml'
            mvn-params: '-f gvnfmadapter/pom.xml'
diff --cc jjb/vfc/vfc-nfvo-lcm-java.yaml
index 24f98c12b,d6596089e..425d489e0
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@@ -11,8 -11,9 +11,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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'