X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdnc%2Fsdnc-apps.yaml;h=0293a9e10fcf9e14807a4f2fc70f31b3c0012328;hb=dc680de42dd485b07b38aeb0a26ee2d3dd3d5828;hp=4e5b1c20177b750e12060e68f5a88d507a488544;hpb=a0e8259f53bcf4fc02a933a6dad842deb766e154;p=ci-management.git

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 4e5b1c201..0293a9e10 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -9,33 +9,39 @@
     name: sdnc-apps
     project-name: 'sdnc-apps'
     jobs:
-      - gerrit-maven-verify
+      - gerrit-maven-verify:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Ddocker.skip.push=true -Pdocker'
       - gerrit-maven-merge:
           cron: '@daily'
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
+          build-node: centos8-builder-4c-4g
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          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: centos8-docker-8c-8g
 
     project: 'sdnc/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    mvn-version : "mvn36"
+          java-version: openjdk17
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -45,7 +51,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
+    maven-version: "mvn38"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -56,7 +62,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'
@@ -64,12 +69,12 @@
     project: 'sdnc/apps'
     project-name: 'sdnc-apps'
     branch: 'master'
-    java-version: openjdk11
-    mvn-version : "mvn36"
+    java-version: openjdk17
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
+    mvn-opts: '-Xmx1024m'
+    maven-version: "mvn38"
 
 #
 #- project:
@@ -100,8 +105,8 @@
     stream:
       - 'master':
           branch: 'master'
-    java-version: openjdk11
-    mvn-version : "mvn36"
+    java-version: openjdk17
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
 - project:
@@ -109,6 +114,6 @@
     project-name: sdnc-apps
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sdnc/apps
     branch: master