Merge "Chore: Turn on SBOM for VFC"

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

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index fac1cbe..c409ef0 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -9,38 +9,37 @@
           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'
           maven-versions-plugin: true
           cron: ''
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-    java-version: openjdk11
+          java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -60,7 +59,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: centos7-docker-arm64-4c-2g
+#    build-node: centos8-docker-arm64-4c-2g
 #
 - project:
     name: ccsdk-distribution-clm
@@ -72,14 +71,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
-    build-node: centos7-docker-8c-8g
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    build-node: centos8-docker-8c-8g
 
 
 - project:
@@ -87,21 +83,6 @@
     project-name: ccsdk-distribution
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/distribution
-    branch: master
-
-- project:
-    name: ccsdk-distribution-whitesource
-    project-name: ccsdk-distribution
-    build-node: centos7-builder-4c-4g
-    jobs:
-      - gerrit-whitesource-scan:
-          java-opts: '-Xmx2048m'
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-distribution-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
+    build-node: centos8-builder-2c-1g
     project: ccsdk/distribution
     branch: master