Merge "Chore: Turn on SBOM for OPTF"

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

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 80f4cf2..eedabbe 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -9,12 +9,13 @@
           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
 
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -22,12 +23,20 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+          java-version: openjdk17
+          jobs:
+            - gerrit-maven-verify:
+                mvn-params: '-Drevision=3.0.0-SNAPSHOT'
+            - gerrit-maven-merge:
+                mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0-SNAPSHOT'
+            - gerrit-maven-stage:
+                mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0'
+            - '{project-name}-gerrit-release-jobs':
+                mvn-params: '-Drevision=3.0.0'
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-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
@@ -47,31 +56,17 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+    java-version: openjdk17
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
-    build-node: ubuntu1804-builder-4c-4g
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    build-node: centos8-builder-4c-4g
 
 - project:
     name: ccsdk-parent-info
     project-name: ccsdk-parent
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/parent
-    branch: master
-
-- project:
-    name: ccsdk-parent-whitesource
-    project-name: ccsdk-parent
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-parent-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
+    build-node: centos8-builder-2c-1g
     project: ccsdk/parent
     branch: master