Convert autorelease builders to common template

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 8296db1b5355fe1d84604ea4b977471c7f652323..d70fb0d278388a74c45bf6691f626db6a2484784 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -15,12 +15,20 @@
             default: '{release-branch}'
             description: "The Release train branch to base build off eg. stable/helium"
 
+- 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:
         - timeout:
             type: absolute
-            timeout: 360
+            timeout: 720
             fail: true
 
 - builder:
@@ -60,10 +68,17 @@
     name: autorelease-generate-taglist
     builders:
         - shell: |
-            git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} >> ../taglist'
+            git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} >> ../taglist.log'
 
 - builder:
     name: autorelease-generate-release-patches
     builders:
         - shell:
             !include-raw-escape include-raw-autorelease-release-versions.sh
+
+- builder:
+    name: autorelease-sys-stats
+    builders:
+        - shell: |
+            uname -a
+            df -h