Fix patch generation and archiving

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

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index c03e26d9f9ec186263995f4cc1619af9ea917b01..e8b1f10d32de2fe3986a5cbc99a30e78118ef202 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -76,6 +76,6 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log'
+            artifacts: 'sources.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
index e71f5cbf68294329039eb347b80a1bc8949434f5..22f1ea0a0347f8660b59a23fc3508adc8a2aa93e 100644 (file)
--- a/jjb/autorelease/autorelease-master.yaml
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -76,6 +76,6 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log'
+            artifacts: 'sources.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index b61248407a37542028b41effd2e5ad098e285c58..af35ac0dafeac90979dcdbfd67a2f7318777930f 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -14,6 +14,9 @@
 ./scripts/version.sh release $RELEASE_TAG
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
-git submodule foreach "git format-patch --stdout origin/master > ../patches/${PWD##*/}.patch"
+
+mkdir patches
+git submodule foreach 'git format-patch --stdout origin/master > ../patches/$name.patch'
 
 ./scripts/fix-relativepaths.sh
+