Merge "Chore: Turn on SBOM for MUSIC"

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

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 06b7213..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,11 +9,11 @@
           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: ''
-          sbom-generator: false
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -27,13 +27,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - '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
@@ -43,48 +40,48 @@
       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'
 
-- project:
-    name: ccsdk-cds-java8
-    project-name: 'ccsdk-cds'
-    jobs:
-      - gerrit-maven-verify:
-          mvn-params: '-Ddocker.skip.push=true -P docker'
-      - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Ddocker.skip.push=true -P docker'
-      - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
-          sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
-      - gerrit-maven-docker-stage:
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-versions-plugin: true
-          cron: '@daily'
+#- project:
+#    name: ccsdk-cds-java8
+#    project-name: 'ccsdk-cds'
+#    jobs:
+#      - gerrit-maven-verify:
+#          mvn-params: '-Ddocker.skip.push=true -P docker'
+#      - gerrit-maven-merge:
+#          cron: '@daily'
+#          mvn-params: '-Ddocker.skip.push=true -P docker'
+#      - gerrit-maven-stage:
+#          build-node: centos8-builder-4c-4g
+#          sign-artifacts: true
+#          mvn-params: '-Dmaven.test.skip=true'
+#          cron: ''
+#      - gerrit-maven-docker-stage:
+#          container-public-registry: 'nexus3.onap.org:10001'
+#          container-staging-registry: 'nexus3.onap.org:10003'
+#          mvn-params: '-Dmaven.test.skip=true -P docker'
+#          maven-versions-plugin: true
+#          cron: '@daily'
 
-    project: 'ccsdk/cds'
-    stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
-    java-version: openjdk8
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-cds-settings'
+#    project: 'ccsdk/cds'
+#    stream:
+#      - 'frankfurt':
+#          branch: 'frankfurt'
+#    java-version: openjdk8
+#    mvn-version: 'mvn38'
+#    mvn-settings: 'ccsdk-cds-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
     # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+#    maven-deploy-properties: |
+#      deployAtEnd=true
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: centos7-docker-8c-8g
+#    mvn-snapshot-id: 'ecomp-snapshots'
+#    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-cds-sonar
@@ -92,7 +89,6 @@
       - 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'
@@ -100,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
@@ -116,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: