commit 5c83e0fcabadf48a229b1099141fd12014c9bdc8
author Michael Lando <ml636r@att.com> Tue Aug 21 19:38:23 2018 +0300
committer Michael Lando <ml636r@att.com> Tue Aug 21 19:42:33 2018 +0300
tree 0f3178a70709eb297ab41ebb60d124fa4ea49b68
parent 0e63c41a711fab2aba339d0887ee6eaab6d932f3

Update SDC jjb

Update sdc jjb to use maven 3.5.3,
Remove jobs from the Beijing branch,
Fix wrong use of the branch parameter for sonar in the jjb.

Change-Id: I515a1477d2fb10ebf07224bcfa426b0e30284386
Issue-ID: SDC-1294
Signed-off-by: Michael Lando <ml636r@att.com>

jjb/sdc/sdc.yaml

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 7be066f..63a0c2e 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -22,12 +22,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sonar
@@ -39,6 +38,6 @@
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch=${branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'