summaryrefslogtreecommitdiffstats
path: root/jjb/sdc/sdc-sdc-tosca.yaml
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-08-21 19:38:23 +0300
committerMichael Lando <ml636r@att.com>2018-08-21 19:42:33 +0300
commit5c83e0fcabadf48a229b1099141fd12014c9bdc8 (patch)
tree0f3178a70709eb297ab41ebb60d124fa4ea49b68 /jjb/sdc/sdc-sdc-tosca.yaml
parent0e63c41a711fab2aba339d0887ee6eaab6d932f3 (diff)
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>
Diffstat (limited to 'jjb/sdc/sdc-sdc-tosca.yaml')
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml5
1 files changed, 2 insertions, 3 deletions
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 206cc777d..8baf6f79f 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'