Do not display Maven download progress

Add configuration to only print Maven download information if something
goes wrong rather than printing the progress. Hopefully cuts down on
logs a little bit.

Also refactor Maven options that are in all the job templates into a
default variable that is passed in.

Change-Id: I09cbc43783ed3ade6b7da96bb575aba3e03c7b8d
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 94ded8d499e2e961b0603eea89de1ba64909452d..bc95076cae2d1477f602640cf64a33230d9878d6 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -71,11 +71,12 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: 'pom.xml'
-          goals: >
-              --quiet dependency:sources
+          goals: |
+              dependency:sources
+              --quiet
               -DoutputFile=$WORKSPACE/sources.log
               -DappendOutput
-              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m'
           settings: '{settings}'

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 36e385a6c0621a7265eea6bcff7d87116a92c43a..9bebc25e16b7b422cac3cce2d8687f9a3736a25e 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -200,6 +200,7 @@
       - autorelease-maven-deploy
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
+          opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: 'mvn33'
           settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 269cf528cf1c284c9dd295f5ecab8503182f44f4..ab84fdbdc4c4b6701772e87af00df2a6a8a58285 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -74,11 +74,12 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
-              clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins
+          goals: |
+              clean deploy
+              -Pintegrationtests,docs,repoBuild
               -Dcheckstyle.skip=true
-              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
@@ -88,6 +89,7 @@
       - autorelease-maven-deploy
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
+          opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: 'mvn33'
           settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 843129a33e57bc038c29a1b524949dd4056b51e1..1d195de3046fd07377e5e9258fe384ebc2f9dcb1 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -66,8 +66,15 @@
     verify-stream: 'boron'
     verify-jdkversion: 'openjdk8'
 
-    # In case a CSIT job is merged without Java version specified
+    # Maven / Java
     jdk: 'openjdk8'
+    opendaylight-infra-mvn-opts: |
+        --show-version
+        --batch-mode
+        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+        -Djenkins
+        -Dmaven.repo.local=/tmp/r
+        -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 
     # Python
     toxdir: ''

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f6b172c03365602631ef202eab832245766b80ca..2a5c70937fb798f928f25afffe8d6cefab511b5f 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -43,12 +43,10 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
+          goals: |
               clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
@@ -198,7 +196,9 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
-          goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+          goals: |
+              {mvn-goals}
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -271,14 +271,11 @@
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
       maven-name: 'mvn33'
-      goals: >
+      goals: |
           {mvn-goals}
-          -V -B
-          -Djenkins
           -Dmerge
           -Dstream={stream}
-          -Dmaven.repo.local=/tmp/r
-          -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          {opendaylight-infra-mvn-opts}
       maven-opts: '{mvn-opts}'
       settings: '{mvn-settings}'
       settings-type: cfp
@@ -380,13 +377,10 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
-          goals: >
+          goals: |
               {mvn-goals}
-              -V -B
-              -Djenkins
               -Dsonar
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           maven-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -398,13 +392,11 @@
           # We should switch to the recommended configuration of sonar once
           # JJB adds support for configurating the Sonar wrapper:
           #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
-          goals: >
+          goals: |
               sonar:sonar
-              -V -B -Djenkins
               -Dsonar
               -Dsonar.host.url=https://sonar.opendaylight.org
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           maven-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -484,12 +476,11 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: validate-pom.xml
-          goals: >
+          goals: |
               clean install dependency:tree
-              -V -B -T1.5C -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -T1.5C
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
           settings: 'autorelease-settings'
@@ -499,12 +490,10 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
+          goals: |
               clean validate
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
@@ -570,12 +559,10 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: '{mvn-version}'
-          goals: >
-              {mvn-goals} -V -B
-              -Djenkins
+          goals: |
+              {mvn-goals}
               -Dstream={stream}
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'