Merge "Clean distribution test job"

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 63da8b741f759fe670267af781131e2e5f519a79..e9e33f728e2c61d9e0a65b4768c4e85050d3fc7a 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -28,7 +28,7 @@
     wrappers:
         - timeout:
             type: absolute
-            timeout: 720
+            timeout: 1440
             fail: true
 
 - trigger:
@@ -94,9 +94,9 @@
         - 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
@@ -132,9 +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