From: Vratko Polak Date: Thu, 23 Jun 2016 10:26:41 +0000 (+0200) Subject: Unify maven goal options some more X-Git-Tag: release/beryllium-sr3~277 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1db2be842f34e42ecfba0bf050f0efc0de9012ee;p=releng%2Fbuilder.git Unify maven goal options some more * Make sure '-V -B' options are explicitly included in every maven goal * Do not add them into MVN_GOALS Change-Id: Ib3a54a482704f6a701bc94fe1ecba2f92619dfd8 Signed-off-by: Vratko Polak --- diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml index 115d939cd..602287a29 100644 --- a/jjb-templates/clm.yaml +++ b/jjb-templates/clm.yaml @@ -40,7 +40,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' maven-opts: '-Xmx4096m -XX:MaxPermSize=512m' settings: '{JENKINS_SETTINGS}' global-settings: '{odl-global-settings}' diff --git a/jjb-templates/distribution-check.yaml b/jjb-templates/distribution-check.yaml index 805e45a01..42b113983 100644 --- a/jjb-templates/distribution-check.yaml +++ b/jjb-templates/distribution-check.yaml @@ -75,7 +75,7 @@ - maven-target: maven-version: '{mvn33}' pom: '$GERRIT_PROJECT/pom.xml' - goals: 'clean install -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}' + goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}' java-opts: - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{JENKINS_SETTINGS}' @@ -84,7 +84,7 @@ maven: maven-name: '{mvn33}' root-pom: 'distribution/pom.xml' - goals: 'clean install -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: '{JENKINS_SETTINGS}' global-settings: '{odl-global-settings}' diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml index c246eb4a4..1fd1381f9 100644 --- a/jjb-templates/distribution.yaml +++ b/jjb-templates/distribution.yaml @@ -45,7 +45,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: '{integration-settings}' global-settings: '{odl-global-settings}' diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml index b65bcdfa0..4c7f64c2f 100644 --- a/jjb-templates/integration.yaml +++ b/jjb-templates/integration.yaml @@ -53,7 +53,7 @@ maven: maven-name: '{mvn33}' root-pom: 'POM' - goals: 'MAVEN_GOALS -B -Djenkins' + goals: 'MAVEN_GOALS -V -B -Djenkins' maven-opts: 'MAVEN_OPTS' settings: '{JENKINS_SETTINGS}' global-settings: '{odl-global-settings}' diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml index d8ab11d23..cb84b99df 100644 --- a/jjb-templates/merge.yaml +++ b/jjb-templates/merge.yaml @@ -56,7 +56,7 @@ maven: maven-name: '{mvn33}' root-pom: 'POM' - goals: 'MAVEN_GOALS -B -Djenkins -Dmerge -Dstream={stream}' + goals: 'MAVEN_GOALS -V -B -Djenkins -Dmerge -Dstream={stream}' maven-opts: 'MAVEN_OPTS' settings: '{JENKINS_SETTINGS}' global-settings: '{odl-global-settings}' @@ -78,7 +78,7 @@ - maven-target: maven-version: '{mvn33}' pom: pom.xml - goals: 'site:deploy -B -Dstream={stream}' + goals: 'site:deploy -V -B -Dstream={stream}' java-opts: - '-Xmx2g' settings: '{JENKINS_SETTINGS}' @@ -86,7 +86,7 @@ - maven-target: maven-version: '{mvn33}' pom: deploy-site.xml - goals: 'site:deploy -B -Dstream={stream}' + goals: 'site:deploy -V -B -Dstream={stream}' java-opts: - '-Xmx2g' settings: '{JENKINS_SETTINGS}' diff --git a/jjb-templates/periodic.yaml b/jjb-templates/periodic.yaml index b7e8f1246..c20911fff 100644 --- a/jjb-templates/periodic.yaml +++ b/jjb-templates/periodic.yaml @@ -50,7 +50,7 @@ maven: maven-name: '{mvn33}' root-pom: 'POM' - goals: 'MAVEN_GOALS -B -Djenkins' + goals: 'MAVEN_GOALS -V -B -Djenkins' maven-opts: 'MAVEN_OPTS' settings: '{JENKINS_SETTINGS}' global-settings: '{odl-global-settings}' diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml index e3dc14162..cea3c8955 100644 --- a/jjb-templates/sonar.yaml +++ b/jjb-templates/sonar.yaml @@ -43,7 +43,7 @@ maven: maven-name: '{mvn33}' root-pom: 'POM' - goals: 'MAVEN_GOALS -B -Djenkins -Dsonar' + goals: 'MAVEN_GOALS -V -B -Djenkins -Dsonar' maven-opts: 'MAVEN_OPTS' settings: '{JENKINS_SETTINGS}' global-settings: '{odl-global-settings}' diff --git a/jjb-templates/validate-autorelease.yaml b/jjb-templates/validate-autorelease.yaml index c643774be..4c7516706 100644 --- a/jjb-templates/validate-autorelease.yaml +++ b/jjb-templates/validate-autorelease.yaml @@ -80,7 +80,7 @@ - maven-target: maven-version: '{mvn33}' pom: validate-pom.xml - goals: 'clean install -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + goals: 'clean install -V -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' java-opts: - '-Xmx8g' settings: '{autorelease-settings}' @@ -89,7 +89,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean validate -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + goals: 'clean validate -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{autorelease-settings}' global-settings: '{odl-global-settings}' diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml index e8e2cf4d7..3947670d4 100644 --- a/jjb-templates/verify.yaml +++ b/jjb-templates/verify.yaml @@ -63,7 +63,7 @@ - maven-target: maven-version: '{mvn33}' pom: 'POM' - goals: 'MAVEN_GOALS -B -Djenkins -Dstream={stream}' + goals: 'MAVEN_GOALS -V -B -Djenkins -Dstream={stream}' java-opts: - 'MAVEN_OPTS' settings: '{JENKINS_SETTINGS}' diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 6c906937d..7ec714ee1 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -53,7 +53,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean deploy -Pintegrationtests,docs,repoBuild -Djenkins -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' + goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -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' maven-opts: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{autorelease-settings}' settings-type: cfp diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml index 684514403..8fd6713a4 100644 --- a/jjb/integration/integration-distribution-jobs.yaml +++ b/jjb/integration/integration-distribution-jobs.yaml @@ -75,7 +75,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}' + goals: 'clean install -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}' maven-opts: '-Xmx1024m -XX:MaxPermSize=256m' global-settings: '{odl-global-settings}' settings: '{integration-settings}' @@ -146,7 +146,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}' + goals: 'clean install -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}' maven-opts: '-Xmx1024m -XX:MaxPermSize=256m' global-settings: '{odl-global-settings}' settings: '{integration-settings}' @@ -167,7 +167,7 @@ - maven-target: maven-version: '{mvn33}' pom: pom.xml - goals: 'site:deploy -Dstream={stream}' + goals: 'site:deploy -V -B -Dstream={stream}' java-opts: - '-Xmx2g' global-settings: '{odl-global-settings}' @@ -175,7 +175,7 @@ - maven-target: maven-version: '{mvn33}' pom: deploy-site.xml - goals: 'site:deploy -Dstream={stream}' + goals: 'site:deploy -V -B -Dstream={stream}' java-opts: - '-Xmx2g' global-settings: '{odl-global-settings}' diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index f85f65d38..9344513af 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -369,7 +369,7 @@ - maven-target: maven-version: '{mvn33}' pom: '$GERRIT_PROJECT/pom.xml' - goals: 'clean install -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}' + goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}' java-opts: - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' global-settings: '{odl-global-settings}' @@ -378,7 +378,7 @@ maven: maven-name: '{mvn33}' root-pom: 'distribution/pom.xml' - goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' global-settings: '{odl-global-settings}' settings: '{integration-settings}' @@ -439,8 +439,8 @@ maven: maven-name: '{mvn33}' root-pom: 'patch_tester/pom.xml' - # TODO: Make Maven option configurable. Currently tests are not skipped, everything elase is. - goals: 'clean install -f patch_tester/pom.xml -Djenkins -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}' + # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is. + goals: 'clean install -f patch_tester/pom.xml -V -B -Djenkins -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}' maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' global-settings: '{odl-global-settings}' settings: '{yangtools-settings}' diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml index c39080eca..8385a41e6 100644 --- a/jjb/releng-templates.yaml +++ b/jjb/releng-templates.yaml @@ -44,7 +44,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean deploy -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage' + goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage' maven-opts: '-Xmx1024m -XX:MaxPermSize=256m' settings: '{autorelease-settings}' global-settings: '{odl-global-settings}' diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py index 2595e3859..233ff88e5 100644 --- a/scripts/jjb-init-project.py +++ b/scripts/jjb-init-project.py @@ -123,7 +123,6 @@ if cfg.get('MVN_GOALS'): mvn_goals = cfg.get('MVN_GOALS') else: mvn_goals = ("clean install " - "-V " # Show Maven / Java version before building "-Dmaven.repo.local=/tmp/r " "-Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r ")