X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fcds.yaml;h=aaaef80b06dcf9df0ad1a2c119cd575f6a682bd7;hb=6343b32a1e48a92a61c92379773975fb2d4d74d1;hp=beb0c1713dc2762d764a3ba63699874c57cebdda;hpb=b69272702c17e8217b5d63ea570d20ccf57dd38a;p=ci-management.git

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index beb0c1713..aaaef80b0 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,22 +1,23 @@
 ---
 - project:
-    name: ccsdk-cds
+    name: ccsdk-cds-java17
     project-name: 'ccsdk-cds'
     jobs:
-      - gerrit-maven-verify
+      - gerrit-maven-verify:
+          mvn-params: '-Ddocker.skip.push=true -Pdocker'
       - gerrit-maven-merge:
           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
-          maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
+          mvn-params: '-Dmaven.test.skip=true -Pdocker'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -26,10 +27,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+          java-version: openjdk17
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
+    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
@@ -38,29 +40,67 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
-    build-node: ubuntu1804-builder-4c-4g
+    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: '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'
+
 - project:
     name: ccsdk-cds-sonar
     jobs:
       - 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: ubuntu1804-builder-4c-4g
+    build-node: centos8-builder-4c-4g
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
+    java-version: openjdk17
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: ccsdk-cds-clm
@@ -72,29 +112,17 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+    java-version: openjdk17
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
-    maven-version: "mvn35"
-    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-cds-info
     project-name: ccsdk-cds
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/cds
-    branch: master
-
-- project:
-    name: ccsdk-cds-whitesource
-    project-name: ccsdk-cds
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'ccsdk-cds-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
+    build-node: centos8-builder-2c-1g
     project: ccsdk/cds
     branch: master