Merge "Chore: Turn on SBOM for MUSIC"

[ci-management.git] / jjb / ccsdk / sli.yaml

diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 34f56cd..c9efc90 100644 (file)
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -9,21 +9,23 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'ccsdk/sli'
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+          java-version: openjdk17
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -32,7 +34,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-builder-4c-4g
+    build-node: centos8-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -42,19 +44,18 @@
       - 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'
-    build-node: centos7-builder-4c-4g
+    build-node: centos8-builder-4c-4g
     project: 'ccsdk/sli'
     project-name: 'ccsdk-sli'
     branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+    java-version: openjdk17
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: ccsdk-sli-clm
@@ -66,31 +67,17 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+    java-version: openjdk17
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
-    build-node: centos7-builder-4c-4g
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    build-node: centos8-builder-4c-4g
 
 - project:
     name: ccsdk-sli-info
     project-name: ccsdk-sli
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/sli
-    branch: master
-
-- project:
-    name: ccsdk-sli-whitesource
-    project-name: ccsdk-sli
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
+    build-node: centos8-builder-2c-1g
     project: ccsdk/sli
     branch: master