Merge "Chore: Turn on SBOM for SO"

[ci-management.git] / jjb / so / so-so-etsi-nfvo.yaml

diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index ee6b43f..1ce164f 100644 (file)
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -9,7 +9,7 @@
     name: so-so-etsi-nfvo-info
     project: so/so-etsi-nfvo
     project-name: so-so-etsi-nfvo
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -20,11 +20,13 @@
       - '{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:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          sbom-generator: true
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -36,13 +38,10 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
-          java-version: openjdk11
     mvn-settings: 'so-so-etsi-nfvo-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-so-etsi-nfvo-sonar
@@ -51,12 +50,11 @@
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so/so-etsi-nfvo'
     project-name: 'so-so-etsi-nfvo'
     branch: 'master'
@@ -72,7 +70,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'so/so-etsi-nfvo'
     project-name: 'so-so-etsi-nfvo'
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'