diff options
| author |   Michael Lando <ml636r@att.com> | 2018-08-12 19:34:40 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-08-15 15:59:04 +0300 |
| commit | e1aab9c00848e0248415ff102972c9445faf0585 (patch) | |
| tree | 462703332c58a5ff01b3909c93d5b7701c1f4413 | |
| parent | b8da70070c1e6b348c040e95cf2bbf352658a4fe (diff) | |
Update SDC sonar jjb
Removed old style Jave memory definitions.
Add sonar branch name property to be passed to the maven on execution.
Add the use of the branch jjb variable, to allow differentiation of what branch the sonar run on.
Add use of the LF npm proxy, populate the reposetory with the LF repo when runing in LF jenkins.
Change-Id: Ia996bb8e925461c3fa5af6c1ff40a0371faa9123
Issue-ID: SDC-1632
Signed-off-by: Michael Lando <ml636r@att.com>
| -rw-r--r-- | jjb/sdc/sdc-jtosca.yaml | 3 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 3 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-tosca.yaml | 3 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 16 |
4 files changed, 16 insertions, 9 deletions
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index c83f6f94f..a30fa6c3d 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -29,5 +29,6 @@ project-name: 'sdc-jtosca' branch: 'master' mvn-settings: 'sdc-jtosca-settings' + mvn-params: '-Dsonar.branch.name=${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 828472685..36135d918 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -29,5 +29,6 @@ project-name: 'sdc-sdc-distribution-client' branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' + mvn-params: '-Dsonar.branch.name=${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 5ab378cec..b241aab1b 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -29,5 +29,6 @@ project-name: 'sdc-sdc-tosca' branch: 'master' mvn-settings: 'sdc-sdc-tosca-settings' + mvn-params: '-Dsonar.branch.name=${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 83520c096..798325c88 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -4,16 +4,20 @@ name: sdc project-name: 'sdc' jobs: - - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-verify-java': + mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - '{project-name}-{stream}-sdc-merge-java': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-{stream}-release-version-java-daily' + mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + - '{project-name}-{stream}-release-version-java-daily': + mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - mvn-params: '-DskipTests=true' - - gerrit-maven-clm + mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + - gerrit-maven-clm: + mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' project: 'sdc' stream: - 'master': @@ -35,6 +39,6 @@ project-name: 'sdc' branch: 'master' mvn-settings: 'sdc-settings' - mvn-params: '-Djacoco.skip=false' + mvn-params: '-Djacoco.skip=false -Dsonar.branch.name=${branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' |