X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdnc%2Fsdnc-apps.yaml;h=d3cc5fe0164db0fc712dd555b69cf90c0f60c3c7;hb=0da95363a323a6395b18eecfae7664debfb12901;hp=7a2c2a71e65e9c02a7cf77877864d0c66f59a4d5;hpb=6a3aaba18c2a1b1df333b11d03524e2f577a3a7f;p=ci-management.git

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 7a2c2a71e..d3cc5fe01 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -9,26 +9,31 @@
     name: sdnc-apps
     project-name: 'sdnc-apps'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
+          cron: ''
       - 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"
+          cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'sdnc/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -39,14 +44,21 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-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: ubuntu1804-builder-4c-4g
     project: 'sdnc/apps'
     project-name: 'sdnc-apps'
     branch: 'master'
@@ -71,7 +83,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
@@ -80,7 +92,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/apps
     project-name: 'sdnc-apps'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
@@ -91,5 +103,6 @@
     project-name: sdnc-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/apps
     branch: master