Chore: Move to centos8-builder

[ci-management.git] / jjb / sdc / sdc-sdc-be-common.yaml

diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 4715d31..88edc50 100644 (file)
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -13,6 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
@@ -21,15 +22,15 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'jakarta':
+          branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'sdc-sdc-be-common-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-be-common-sonar
@@ -37,9 +38,8 @@
       - 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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-be-common'
@@ -57,7 +57,9 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/sdc-be-common
     project-name: 'sdc-sdc-be-common'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'sdc-sdc-be-common-settings'
 
 - project: