Upload and download Fuel ISOs in scope of fuel-merge jobs

[releng.git] / jjb / fuel / fuel.yml

diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml
index 97bac40..1625124 100644 (file)
--- a/jjb/fuel/fuel.yml
+++ b/jjb/fuel/fuel.yml
@@ -66,6 +66,9 @@
     wrappers:
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
+        - timeout:
+            timeout: 360
+            fail: true
 
     triggers:
         - gerrit:
@@ -199,6 +202,9 @@
     wrappers:
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
+        - timeout:
+            timeout: 360
+            fail: true
 
     triggers:
         - gerrit:
@@ -216,10 +222,10 @@
     builders:
         - shell:
             !include-raw ./fuel-build.sh
-#        - shell:
-#            !include-raw ./fuel-upload-artifact.sh
-#        - shell:
-#            !include-raw ./fuel-workspace-cleanup.sh
+        - shell:
+            !include-raw ./fuel-upload-artifact.sh
+        - shell:
+            !include-raw ./fuel-workspace-cleanup.sh
 
 - job-template:
     name: 'fuel-merge-virtual-deploy-{stream}'
@@ -275,12 +281,12 @@
             dependency-jobs: 'fuel-merge-build-{stream}'
 
     builders:
-#        - shell:
-#            !include-raw ./fuel-download-artifact.sh
+        - shell:
+            !include-raw ./fuel-download-artifact.sh
         - shell:
             !include-raw ./fuel-virtual-deploy.sh
-#        - shell:
-#            !include-raw ./fuel-workspace-cleanup.sh
+        - shell:
+            !include-raw ./fuel-workspace-cleanup.sh
 
 - job-template:
     name: 'fuel-daily-{stream}'
@@ -330,7 +336,7 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
         - trigger-builds:
-          - project: 'yardstick-fuel-{stream}'
+          - project: 'yardstick-fuel-lf-{stream}'
             block: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
@@ -366,6 +372,11 @@
             refspec: ''
             branch: '{branch}'
 
+    wrappers:
+        - timeout:
+            timeout: 360
+            fail: true
+
     builders:
         - shell:
             !include-raw ./fuel-build.sh