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 <xudan16@huawei.com>

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index b65e6d5..5651fc3 100644 (file)
--- 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 7b3ede9..eaa11b5 100644 (file)
--- 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/**/*'