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>
16 files changed:
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'beijing':
- branch: 'beijing'
functionality:
- 'sanity':
trigger_jobs:
functionality:
- 'sanity':
trigger_jobs:
robot-options: ''
branch: 'master'
html-dir: 'archives'
robot-options: ''
branch: 'master'
html-dir: 'archives'
- html-files: 'SDC_CI_Extent_Report.html'
\ No newline at end of file
+ html-files: 'SDC_CI_Extent_Report.html'
project-name: 'sdc-dcae-d-ci'
branch: 'master'
mvn-settings: 'sdc-dcae-d-ci-settings'
project-name: 'sdc-dcae-d-ci'
branch: 'master'
mvn-settings: 'sdc-dcae-d-ci-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
project-name: 'sdc-dcae-d-dt-be-main'
branch: 'master'
mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
project-name: 'sdc-dcae-d-dt-be-main'
branch: 'master'
mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
project-name: 'sdc-dcae-d-dt-be-property'
branch: 'master'
mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
project-name: 'sdc-dcae-d-dt-be-property'
branch: 'master'
mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
project-name: 'sdc-dcae-d-dt'
branch: 'master'
mvn-settings: 'sdc-dcae-d-dt-settings'
project-name: 'sdc-dcae-d-dt'
branch: 'master'
mvn-settings: 'sdc-dcae-d-dt-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
project-name: 'sdc-dcae-d-fe'
branch: 'master'
mvn-settings: 'sdc-dcae-d-fe-settings'
project-name: 'sdc-dcae-d-fe'
branch: 'master'
mvn-settings: 'sdc-dcae-d-fe-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
project-name: 'sdc-dcae-d-tosca-lab'
branch: 'master'
mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
project-name: 'sdc-dcae-d-tosca-lab'
branch: 'master'
mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'beijing':
- branch: 'beijing'
mvn-settings: 'sdc-jtosca-settings'
files: '**'
archive-artifacts: ''
build-timeout: 60
mvn-settings: 'sdc-jtosca-settings'
files: '**'
archive-artifacts: ''
build-timeout: 60
- project:
name: sdc-jtosca-sonar
- project:
name: sdc-jtosca-sonar
project-name: 'sdc-jtosca'
branch: 'master'
mvn-settings: 'sdc-jtosca-settings'
project-name: 'sdc-jtosca'
branch: 'master'
mvn-settings: 'sdc-jtosca-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
files: '**'
archive-artifacts: ''
build-timeout: 60
files: '**'
archive-artifacts: ''
build-timeout: 60
- project:
name: sdc-onap-ui-sonar
- project:
name: sdc-onap-ui-sonar
project-name: 'sdc-onap-ui'
branch: 'master'
mvn-settings: 'sdc-onap-ui-settings'
project-name: 'sdc-onap-ui'
branch: 'master'
mvn-settings: 'sdc-onap-ui-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'beijing':
- branch: 'beijing'
mvn-settings: 'sdc-sdc-distribution-client-settings'
files: '**'
archive-artifacts: ''
build-timeout: 60
mvn-settings: 'sdc-sdc-distribution-client-settings'
files: '**'
archive-artifacts: ''
build-timeout: 60
- project:
name: sdc-sdc-distribution-client-sonar
- project:
name: sdc-sdc-distribution-client-sonar
project-name: 'sdc-sdc-distribution-client'
branch: 'master'
mvn-settings: 'sdc-sdc-distribution-client-settings'
project-name: 'sdc-sdc-distribution-client'
branch: 'master'
mvn-settings: 'sdc-sdc-distribution-client-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'beijing':
- branch: 'beijing'
mvn-settings: 'sdc-sdc-docker-base-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-8c-8g
mvn-settings: 'sdc-sdc-docker-base-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-8c-8g
files: '**'
archive-artifacts: ''
build-timeout: 60
files: '**'
archive-artifacts: ''
build-timeout: 60
- project:
name: sdc-sdc-pubsub-sonar
- project:
name: sdc-sdc-pubsub-sonar
project-name: 'sdc-sdc-pubsub'
branch: 'master'
mvn-settings: 'sdc-sdc-pubsub-settings'
project-name: 'sdc-sdc-pubsub'
branch: 'master'
mvn-settings: 'sdc-sdc-pubsub-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
files: '**'
archive-artifacts: ''
build-timeout: 60
files: '**'
archive-artifacts: ''
build-timeout: 60
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'beijing':
- branch: 'beijing'
mvn-settings: 'sdc-sdc-tosca-settings'
files: '**'
archive-artifacts: ''
build-timeout: 60
mvn-settings: 'sdc-sdc-tosca-settings'
files: '**'
archive-artifacts: ''
build-timeout: 60
- project:
name: sdc-sdc-tosca-sonar
- project:
name: sdc-sdc-tosca-sonar
project-name: 'sdc-sdc-tosca'
branch: 'master'
mvn-settings: 'sdc-sdc-tosca-settings'
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'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'beijing':
- branch: 'beijing'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
build-node: ubuntu1604-builder-4c-4g
mvn-settings: 'sdc-sdc-workflow-designer-settings'
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
build-node: ubuntu1604-builder-4c-4g
- project:
name: sdc-sdc-workflow-designer-sonar
- project:
name: sdc-sdc-workflow-designer-sonar
project-name: 'sdc-sdc-workflow-designer'
branch: 'master'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
project-name: 'sdc-sdc-workflow-designer'
branch: 'master'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
- mvn-params: '-Dsonar.branch=${branch}'
+ mvn-params: '-Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'beijing':
- branch: 'beijing'
mvn-settings: 'sdc-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-8c-8g
mvn-settings: 'sdc-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-8c-8g
- project:
name: sdc-sonar
- project:
name: sdc-sonar
project-name: 'sdc'
branch: 'master'
mvn-settings: 'sdc-settings'
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'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'