From 7af99811f5d6bb6aedda7e7a25d538edc9759ce4 Mon Sep 17 00:00:00 2001 From: xudan Date: Thu, 30 Mar 2017 07:01:38 +0000 Subject: dovetail: fix wrapper disable problem JIRA: DOVETAIL-377 Since there are two wrappers in dovetail-ci-jobs.yml and dovetail-weekly-jobs.yml, respectively, the first wrapper (build-name and timeout) is disable. Combine them into one wrapper with build-name, timeout and fix-workspace-permissions. Change-Id: I4a4f766fc90612be2642bc01708d93392fb163ed Signed-off-by: xudan --- jjb/dovetail/dovetail-ci-jobs.yml | 4 +--- jjb/dovetail/dovetail-weekly-jobs.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index b65e6d5ef..5651fc3f2 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -169,6 +169,7 @@ - timeout: timeout: 180 abort: true + - fix-workspace-permissions triggers: - '{auto-trigger-name}' @@ -208,9 +209,6 @@ - 'dovetail-cleanup' - 'dovetail-run' - wrappers: - - fix-workspace-permissions - publishers: - archive: artifacts: 'results/**/*' diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml index 7b3ede902..eaa11b54a 100644 --- a/jjb/dovetail/dovetail-weekly-jobs.yml +++ b/jjb/dovetail/dovetail-weekly-jobs.yml @@ -78,6 +78,7 @@ - timeout: timeout: '{job-timeout}' abort: true + - fix-workspace-permissions parameters: - project-parameter: @@ -114,9 +115,6 @@ - 'dovetail-cleanup' - 'dovetail-run' - wrappers: - - fix-workspace-permissions - publishers: - archive: artifacts: 'results/**/*' -- cgit 1.2.3-korg