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>
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 206cc77..8baf6f7 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -12,12 +12,11 @@
stream:
- 'master':
branch: 'master'
- - 'beijing':
- branch: 'beijing'
mvn-settings: 'sdc-sdc-tosca-settings'
files: '**'
archive-artifacts: ''
build-timeout: 60
+ maven-version: 'mvn35'
- project:
name: sdc-sdc-tosca-sonar
@@ -29,6 +28,6 @@
project-name: 'sdc-sdc-tosca'
branch: 'master'
mvn-settings: 'sdc-sdc-tosca-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'