diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-10-10 19:42:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-10 19:42:16 +0000 |
| commit | c5bb7b8624ca6b013eecaa9d117bbc325b941902 (patch) | |
| tree | 6314f0a5e6c7af257cfe3d9a90e36383c1a45955 /jjb/fuel | |
| parent | ea2f9cd48459650545e7ea22c33eb6ce9ff9da33 (diff) | |
| parent | c9274c7a8253836cf73c927c11b6d832114fe3f9 (diff) | |
Merge "fuel: Drop obsolete DEPLOY_TIMEOUT"
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yml | 9 | ||||
| -rw-r--r-- | jjb/fuel/fuel-weekly-jobs.yml | 4 |
2 files changed, 5 insertions, 8 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 diff --git a/jjb/fuel/fuel-weekly-jobs.yml b/jjb/fuel/fuel-weekly-jobs.yml index 2544e9210..f21c58660 100644 --- a/jjb/fuel/fuel-weekly-jobs.yml +++ b/jjb/fuel/fuel-weekly-jobs.yml @@ -156,10 +156,6 @@ - string: name: DEPLOY_SCENARIO default: 'os-odl-nofeature-ha' - - string: - name: DEPLOY_TIMEOUT - default: '150' - description: 'Deployment timeout in minutes' scm: - git-scm |