From: Michael Lando Date: Tue, 21 Aug 2018 16:38:23 +0000 (+0300) Subject: Update SDC jjb X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5c83e0fcabadf48a229b1099141fd12014c9bdc8;p=ci-management.git 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 --- diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 0e2041473..db3db4ca2 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' functionality: - 'sanity': trigger_jobs: @@ -23,4 +21,4 @@ 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' diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index 6494da9c1..292bf851e 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -30,6 +30,6 @@ 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' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 47a2eed1a..ae44b01ac 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -30,6 +30,6 @@ 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' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index f1b7c7fa8..60eebbc02 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -26,6 +26,6 @@ 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' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 9e5a39ce1..3913fc2a2 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -31,6 +31,6 @@ 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' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 3504852a2..4142e859d 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -31,6 +31,6 @@ 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' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 8866c2955..fce057baa 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -25,6 +25,6 @@ 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' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 6296e2b50..01890a040 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -12,12 +12,11 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' build-timeout: 60 + maven-version: 'mvn35' - project: name: sdc-jtosca-sonar @@ -29,6 +28,6 @@ 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' diff --git a/jjb/sdc/sdc-onap-ui.yaml b/jjb/sdc/sdc-onap-ui.yaml index 38a7f7bde..2b09a246b 100644 --- a/jjb/sdc/sdc-onap-ui.yaml +++ b/jjb/sdc/sdc-onap-ui.yaml @@ -15,6 +15,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 + maven-version: 'mvn35' - project: name: sdc-onap-ui-sonar @@ -26,6 +27,6 @@ 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' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 8ea64fcdf..90606ad5f 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -12,12 +12,11 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'sdc-sdc-distribution-client-settings' files: '**' archive-artifacts: '' build-timeout: 60 + maven-version: 'mvn35' - project: name: sdc-sdc-distribution-client-sonar @@ -29,6 +28,6 @@ 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' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 766d0af47..c03e353a9 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -11,9 +11,8 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-8c-8g + maven-version: 'mvn35' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 0746bca62..294e82fad 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -21,6 +21,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 + maven-version: 'mvn35' - project: name: sdc-sdc-pubsub-sonar @@ -32,6 +33,6 @@ 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' diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index 035e0e0a2..128f02cb0 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -16,3 +16,4 @@ files: '**' archive-artifacts: '' build-timeout: 60 + maven-version: 'mvn35' 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' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 62c8c2145..a7db7e6ea 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -13,14 +13,13 @@ 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 + maven-version: 'mvn35' - project: name: sdc-sdc-workflow-designer-sonar @@ -32,6 +31,6 @@ 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' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 7be066f06..63a0c2e44 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'