summaryrefslogtreecommitdiffstats
path: root/jjb/fuel/fuel-daily-jobs.yml
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2017-10-10 19:42:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-10 19:42:16 +0000
commitc5bb7b8624ca6b013eecaa9d117bbc325b941902 (patch)
tree6314f0a5e6c7af257cfe3d9a90e36383c1a45955 /jjb/fuel/fuel-daily-jobs.yml
parentea2f9cd48459650545e7ea22c33eb6ce9ff9da33 (diff)
parentc9274c7a8253836cf73c927c11b6d832114fe3f9 (diff)
Merge "fuel: Drop obsolete DEPLOY_TIMEOUT"
Diffstat (limited to 'jjb/fuel/fuel-daily-jobs.yml')
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index b6a1bc469..92ad8e69a 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -226,6 +226,8 @@
- trigger-builds:
- project: 'fuel-collect-logs-{pod}-daily-{stream}'
current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
block: true
same-node: true
block-thresholds:
@@ -272,10 +274,6 @@
- string:
name: DEPLOY_SCENARIO
default: 'os-odl-nofeature-ha'
- - string:
- name: DEPLOY_TIMEOUT
- default: '150'
- description: 'Deployment timeout in minutes'
scm:
- git-scm
@@ -315,6 +313,9 @@
gs-pathname: '{gs-pathname}'
- '{slave-label}-defaults':
installer: '{installer}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-odl-nofeature-ha'
scm:
- git-scm