Merge "Install openssl-devel on robot VM"

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 8f7793eea205b4d5f6735901b0a421bd0441f7bf..bb9bf2700dfb14fbdc788784c5d5a3cfc5610f36 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -15,14 +15,6 @@
             default: '{release-branch}'
             description: "The Release train branch to base build off eg. stable/beryllium"
 
-- parameter:
-    name: autorelease-release-datestamp
-    parameters:
-        - bool:
-            name: DATESTAMP
-            default: '{datestamp}'
-            description: "Whether to include a datestamp or not"
-
 - wrapper:
     name: autorelease-build-timeout
     wrappers:
@@ -129,7 +121,18 @@
     name: autorelease-generate-taglist
     builders:
         - shell: |
-            git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} >> ../taglist.log'
+            echo autorelease `git rev-parse --verify HEAD` ${RELEASE_TAG} | tee -a $WORKSPACE/taglist.log
+            git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} | tee -a $WORKSPACE/taglist.log'
+
+- builder:
+    name: autorelease-distribute-taglist
+    builders:
+        - shell: |
+            if [ -d "integration/distribution/distributions" ]; then
+                cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distributions/karaf/src/main/assembly/"
+            else
+                cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distribution-karaf/src/main/assembly/"
+            fi
 
 - builder:
     name: autorelease-generate-release-patches