Merge "Add option to not skip git.properties"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 37c23140152b50a7f292843e842bb347aa735484..9e36e097c42e4ff88192970aeaf40a28913485a4 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1378,11 +1378,10 @@
           maven-version: 'mvn33'
           pom: '{project}/pom.xml'
           goals: >
-              clean install dependency:tree -V -B -Djenkins
-              -DskipTests
-              -Dcheckstyle.skip=true
-              -Dmaven.javadoc.skip=true
-              -Dmaven.site.skip=true
+              clean install dependency:tree
+              -V -B -Pq
+              -Dgitid.skip=false
+              -Djenkins
               -DgenerateReports=false
               -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
               -Dstream={stream}
@@ -1397,7 +1396,10 @@
       maven-name: 'mvn33'
       root-pom: 'distribution/pom.xml'
       goals: >
-          clean install dependency:tree -V -B -Djenkins
+          clean install dependency:tree
+          -V -B -Pq
+          -Dgitid.skip=false
+          -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'