Improve sources.log output and formatting

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

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index c03b620037c511f993bfda01b03d48abcc00468b..4c289c452546d4f4bb8bf260981ea8d3d9b546db 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -69,11 +69,12 @@
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'dependencies.log,sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'
 
@@ -138,10 +139,11 @@
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'dependencies.log,sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index c144bbfd5cf89eac8cb07fb398f6b0b657a635e1..1cb313777cc9974bf2a1325fd43a41667c43dae3 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -43,8 +43,13 @@
         - maven-target:
             maven-version: '{maven-version}'
             pom: 'pom.xml'
-            goals: 'dependency:sources -l sources.log -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            goals: 'dependency:sources -DoutputFile=sources.log -DappendOutput -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m'
             settings: '{settings}'
             global-settings: '{global-settings}'
+- builder:
+    name: autorelease-maven-sources-post-process
+    builders:
+        - shell: |
+            awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
index e1358bcc2b4069d849fff95c1d2880ae19414579..f7241d188f73f910d65cf73badb59a66ffceaeee 100644 (file)
--- a/jjb/autorelease/autorelease-master.yaml
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -68,10 +68,11 @@
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'dependencies.log,sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'