split autorelease fix-relative-paths step

Currently autorelease-generate-release-patches step contains
both release tag patch generation and fix-relativepaths.sh
script which is missleading.
fix-relativepaths is needed for compilation and is not related
to the release tag patches generation.
Therefore, I separated them.

Change-Id: I68643052b512a566d776d6a4cc557a5c4a6eefcf
Signed-off-by: Ravit Peretz <ravit.peretz@hpe.com>

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index ba05699b3194860b24b100f30aab7b3a840ab1dd..ad0838afa6a518420627274d300e3a28cc16f124 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -132,3 +132,10 @@
     - shell:
         !include-raw:
             - include-raw-generate-project-report.sh
+
+- builder:
+    name: autorelease-fix-relative-paths
+    builders:
+        - shell: |
+            ./scripts/fix-relativepaths.sh
+

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index b6becab679466b92cb74de21c3856df8b82cc644..fe6207649e3fa79fa3190ea90db1cb64f0676be4 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -63,6 +63,7 @@
         - autorelease-generate-taglist
         - autorelease-distribute-taglist
         - autorelease-generate-release-patches
+        - autorelease-fix-relative-paths
         - maven-target:
               maven-version: 'mvn33'
               pom: 'pom.xml'

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 66d8808b183079958dc72666b202720302cdd65b..1ad25e4b51ddb1d58c984b1c8cca16f43704c25f 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -36,4 +36,3 @@ tar cvzf all-bundles.tar.gz `find $PATCH_DIR -type f -print0 \
                                 | cut -d: -f1`
 rm $PATCH_DIR/*.bundle
 
-./scripts/fix-relativepaths.sh