Merge "Add -Djenkins parameter to all CI jobs"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index a261c9dc9bec7518158222be2d3c1a1fe9ff1888..e5c30d28aa04239c5efcba6539fc586746c9d7e7 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -46,13 +46,16 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{autorelease-settings}'
         - autorelease-generate-taglist
         - autorelease-generate-release-patches
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -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}'
@@ -118,13 +121,16 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - autorelease-cfp:
+            autorelease-settings: '{autorelease-settings}'
+            odl-global-settings: '{odl-global-settings}'
         - autorelease-generate-taglist
         - autorelease-generate-release-patches
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -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}'
@@ -132,9 +138,6 @@
         post-step-run-condition: UNSTABLE
 
     postbuilders:
-        - autorelease-cfp:
-            autorelease-settings: '{autorelease-settings}'
-            odl-global-settings: '{odl-global-settings}'
         - autorelease-maven-deploy
         - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-get-integration-test-variables
@@ -204,10 +207,12 @@
         - inject:
             properties-file: variables.prop
         - autorelease-generate-project-report
+        - shell: "./scripts/list-project-dependencies.sh"
+        - autorelease-sys-stats
 
     publishers:
     - archive-artifacts:
-        artifacts: 'project-reports/*.log'
+        artifacts: '*.log,project-reports/*.log'
     - email-ext:
         attachments: 'project-reports/*.log'
         recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'