X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdnc%2Fsdnc-apps.yaml;h=ae024d0c541774d25743b6bb42aa2aa54dcb3d89;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=edb5b90a87a50838e875cfd0ff96017356df34eb;hpb=59ad085a48a4c9803195241427bb5f03ec1c101e;p=ci-management.git

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index edb5b90a8..2287a8cdd 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -9,17 +9,27 @@
     name: sdnc-apps
     project-name: 'sdnc-apps'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - 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:
-          sign-artifacts: true
           build-node: centos7-builder-4c-4g
+          sign-artifacts: true
+          mvn-params: '-Dmaven.test.skip=true'
+          cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          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':
           build-node: centos7-docker-8c-8g
 
@@ -27,10 +37,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -40,22 +52,31 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn38"
+    build-node: ubuntu2004-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: sdnc-apps-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: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'sdnc/apps'
     project-name: 'sdnc-apps'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn38"
 
 #
 #- project:
@@ -73,7 +94,7 @@
 #    mvn-settings: 'sdnc-apps-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-apps-clm
@@ -82,10 +103,16 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/apps
     project-name: 'sdnc-apps'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
 - project:
@@ -93,5 +120,6 @@
     project-name: sdnc-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/apps
     branch: master