From c9274c7a8253836cf73c927c11b6d832114fe3f9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 8 Oct 2017 19:23:25 +0200 Subject: [PATCH] fuel: Drop obsolete DEPLOY_TIMEOUT While at it, add missing DEPLOY_SCENARIO for Fuel log collection job. This will add some more useful info to each job description text. Change-Id: I4936013dc23ed696ad4a526961b23031753aed2a Signed-off-by: Alexandru Avadanii --- jjb/fuel/fuel-daily-jobs.yml | 9 +++++---- 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 -- 2.16.6