From ed888be3521a02fdf4a0c051f816cf9ba23b4d36 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Thu, 16 Aug 2018 18:07:52 +0300 Subject: [PATCH] Update SDC sonar jjb Removed old style Java memory definitions. Fix incorrect sonar property definition. Change sonar.branch.name to sonar.branch, Because current sonar version does not support the property. Change-Id: I79f417fe41de3599f65d54013ac2aceed79bef31 Issue-ID: SDC-1632 Signed-off-by: Michael Lando --- jjb/sdc/sdc-dcae-d-ci.yaml | 3 ++- jjb/sdc/sdc-dcae-d-dt-be-main.yaml | 3 ++- jjb/sdc/sdc-dcae-d-dt-be-property.yaml | 3 ++- jjb/sdc/sdc-dcae-d-dt.yaml | 3 ++- jjb/sdc/sdc-dcae-d-fe.yaml | 3 ++- jjb/sdc/sdc-dcae-d-tosca-lab.yaml | 3 ++- jjb/sdc/sdc-jtosca.yaml | 2 +- jjb/sdc/sdc-onap-ui.yaml | 3 ++- jjb/sdc/sdc-sdc-distribution-client.yaml | 2 +- jjb/sdc/sdc-sdc-pubsub.yaml | 3 ++- jjb/sdc/sdc-sdc-tosca.yaml | 2 +- jjb/sdc/sdc-sdc-workflow-designer.yaml | 3 ++- jjb/sdc/sdc.yaml | 2 +- 13 files changed, 22 insertions(+), 13 deletions(-) diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index a11d53e9b..6494da9c1 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -30,5 +30,6 @@ project-name: 'sdc-dcae-d-ci' branch: 'master' mvn-settings: 'sdc-dcae-d-ci-settings' + mvn-params: '-Dsonar.branch=${branch}' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + 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 d2f623314..47a2eed1a 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -30,5 +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-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + 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 e1c63c22a..f1b7c7fa8 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -26,5 +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-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index ac0f56679..9e5a39ce1 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -31,5 +31,6 @@ project-name: 'sdc-dcae-d-dt' branch: 'master' mvn-settings: 'sdc-dcae-d-dt-settings' + mvn-params: '-Dsonar.branch=${branch}' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 4b13a9e8e..3504852a2 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -31,5 +31,6 @@ project-name: 'sdc-dcae-d-fe' branch: 'master' mvn-settings: 'sdc-dcae-d-fe-settings' + mvn-params: '-Dsonar.branch=${branch}' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 1fec7f70b..8866c2955 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -25,5 +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-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file + mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index a30fa6c3d..6296e2b50 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -29,6 +29,6 @@ project-name: 'sdc-jtosca' branch: 'master' mvn-settings: 'sdc-jtosca-settings' - mvn-params: '-Dsonar.branch.name=${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 3d02e68b4..38a7f7bde 100644 --- a/jjb/sdc/sdc-onap-ui.yaml +++ b/jjb/sdc/sdc-onap-ui.yaml @@ -26,5 +26,6 @@ project-name: 'sdc-onap-ui' branch: 'master' mvn-settings: 'sdc-onap-ui-settings' + mvn-params: '-Dsonar.branch=${branch}' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 36135d918..8ea64fcdf 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -29,6 +29,6 @@ project-name: 'sdc-sdc-distribution-client' branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' - mvn-params: '-Dsonar.branch.name=${branch}' + mvn-params: '-Dsonar.branch=${branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 8d8a43dd6..6bd492489 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -33,5 +33,6 @@ project-name: 'sdc-sdc-pubsub' branch: 'master' mvn-settings: 'sdc-sdc-pubsub-settings' + mvn-params: '-Dsonar.branch=${branch}' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index b241aab1b..206cc777d 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -29,6 +29,6 @@ project-name: 'sdc-sdc-tosca' branch: 'master' mvn-settings: 'sdc-sdc-tosca-settings' - mvn-params: '-Dsonar.branch.name=${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 efa30975f..62c8c2145 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -32,5 +32,6 @@ project-name: 'sdc-sdc-workflow-designer' branch: 'master' mvn-settings: 'sdc-sdc-workflow-designer-settings' + mvn-params: '-Dsonar.branch=${branch}' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 798325c88..7be066f06 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -39,6 +39,6 @@ project-name: 'sdc' branch: 'master' mvn-settings: 'sdc-settings' - mvn-params: '-Djacoco.skip=false -Dsonar.branch.name=${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' -- 2.16.6