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

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

774a4bcceb1d9ab9d38084e50e1f3f9e71e11659
diff --cc jjb/usecaseui/usecase-ui-intent-analysis.yaml
index 92cc787c7,03a0e6877..0e8699271
--- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml
+++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
@@@ -14,10 -14,12 +14,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-8c-8g
            mvn-params: '-P docker -Dmaven.test.skip=true'
            container-public-registry: 'nexus3.onap.org:10001'
diff --cc jjb/usecaseui/usecase-ui-nlp.yaml
index ef52d2c94,354ca72ec..cb2c81016
--- a/jjb/usecaseui/usecase-ui-nlp.yaml
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@@ -14,8 -14,9 +14,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-daily':
            mvn-params: '-Dmaven.test.skip=true'
diff --cc jjb/usecaseui/usecase-ui-server.yaml
index 86dfa309a,455a4022e..3ff14dd69
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@@ -14,8 -14,9 +14,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-daily':
            mvn-params: '-Dmaven.test.skip=true'
diff --cc jjb/usecaseui/usecase-ui.yaml
index 518f73ef2,60453a4b2..4f399529d
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@@ -19,8 -19,9 +19,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-daily':
            mvn-params: '-Dmaven.test.skip=true'