Fix autorelease patches not generating during build

Also move taglist.log into the patches directory for archiving.

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 30dc6ddf86b6fa7383a7b08e82f346ffd144c6ef..e9e33f728e2c61d9e0a65b4768c4e85050d3fc7a 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -132,9 +132,9 @@
 - builder:
     name: autorelease-generate-release-patches
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-autorelease-release-versions.sh
+    - shell:
+        !include-raw:
+            - include-raw-autorelease-release-versions.sh
 
 - builder:
     name: autorelease-sys-stats

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 9e3a833947d708c38d04586d67dd15f246538307..bc2591b757c77fdaf94c407cbb1e5186b3e3b154 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -75,7 +75,7 @@
 
     publishers:
     - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.patch'
+        artifacts: '*.prop,*.log,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 99c40872a5be5d4091caea858ef52d3fcf71788b..1932859624856d598246123279cd41a40d74a7ef 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -26,6 +26,7 @@ git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 mkdir patches
+mv taglist.log $PATCH_DIR
 modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
 for module in $modules; do
     pushd $module