Merge "Chore: Turn on SBOM for OPTF"

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

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 708a2e4..aaaef80 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: ccsdk-cds-java11
+    name: ccsdk-cds-java17
     project-name: 'ccsdk-cds'
     jobs:
       - gerrit-maven-verify:
@@ -9,7 +9,7 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
@@ -27,11 +27,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk11
+          java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -41,7 +40,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -97,11 +96,11 @@
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: ccsdk-cds-clm
@@ -113,9 +112,10 @@
     stream:
       - 'master':
           branch: 'master'
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 - project: