X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-macros.yaml;h=da183a1012c587ce40fb9432f76e7e754596f494;hb=7151b63f96733b70ff8c6cefe1425f7ecbe29dcd;hp=d84972099d009d93fc251c64c6085f6bdd70f5fb;hpb=66101f6a056072c6e00ca7dd59432ef8dc18fe72;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index d84972099..da183a101 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -5,7 +5,7 @@
         - string:
             name: RELEASE_TAG
             default: '{release-tag}'
-            description: "The Release train tag to use eg. Helium-SR3"
+            description: "The Release train tag to use eg. Beryllium-SR1"
 
 - parameter:
     name: autorelease-release-branch
@@ -13,7 +13,7 @@
         - string:
             name: RELEASE_BRANCH
             default: '{release-branch}'
-            description: "The Release train branch to base build off eg. stable/helium"
+            description: "The Release train branch to base build off eg. stable/beryllium"
 
 - parameter:
     name: autorelease-release-datestamp
@@ -28,7 +28,7 @@
     wrappers:
         - timeout:
             type: absolute
-            timeout: 720
+            timeout: 1440
             fail: true
 
 - trigger:
@@ -79,20 +79,31 @@
                     - compare-type: ANT
                       pattern: site.xml
 
+- builder:
+    name: autorelease-checkout-gerrit-patch
+    builders:
+        - shell: |
+            cd ${GERRIT_PROJECT}
+            echo "Checking out ${GERRIT_PROJECT} patch ${GERRIT_REFSPEC}..."
+            git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
+            cd ..
+
 - builder:
     name: autorelease-cfp
     builders:
         - config-file-provider:
             files:
                 - file-id: '{autorelease-settings}'
-                  variable: 'AUTORELEASE_SETTINGS'
+                  variable: 'SETTINGS_FILE'
                 - file-id: '{odl-global-settings}'
-                  variable: 'ODL_GLOBAL_SETTINGS'
+                  variable: 'GLOBAL_SETTINGS_FILE'
 
 - builder:
     name: autorelease-maven-deploy
     builders:
-        - shell: !include-raw include-raw-autorelease-maven-deploy.sh
+        - shell:
+            !include-raw:
+                - include-raw-autorelease-maven-deploy.sh
 
 - builder:
     name: autorelease-maven-sources
@@ -121,8 +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
@@ -134,9 +146,13 @@
 - builder:
     name: autorelease-get-integration-test-variables
     builders:
-    - shell: !include-raw include-raw-autorelease-get-integration-test-variables.sh
+    - shell:
+        !include-raw:
+            - include-raw-autorelease-get-integration-test-variables.sh
 
 - builder:
     name: autorelease-generate-project-report
     builders:
-    - shell: !include-raw include-raw-generate-project-report.sh
+    - shell:
+        !include-raw:
+            - include-raw-generate-project-report.sh