X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fapps.yaml;h=423e4af45b6f83882f50d4e1b43a3dd920087b48;hb=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=0883258356cbbc5252ee3fb3f122a28b9664bfa7;hpb=20b6c2d0b4595cbfe9cf313ee2e14cae5a4a2804;p=ci-management.git

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 088325835..423e4af45 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -9,30 +9,36 @@
     name: ccsdk-apps
     project-name: 'ccsdk-apps'
     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-docker-8c-8g
           sign-artifacts: 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'
+          mvn-params: '-Dmaven.test.skip=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/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+          java-version: openjdk17
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-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
@@ -41,7 +47,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos8-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -51,7 +57,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'
@@ -59,11 +64,11 @@
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+    java-version: openjdk17
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: ccsdk-apps-clm
@@ -75,11 +80,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+    java-version: openjdk17
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: ubuntu1804-builder-4c-4g
 
 #- project:
@@ -104,19 +108,6 @@
     project-name: ccsdk-apps
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/apps
-    branch: master
-
-- project:
-    name: ccsdk-apps-whitesource
-    project-name: ccsdk-apps
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-apps-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
+    build-node: centos8-builder-2c-1g
     project: ccsdk/apps
     branch: master