From 897eb26864f2dc1a790b8ae51d031ace421450e9 Mon Sep 17 00:00:00 2001
From: chigang <chigang@huawei.com>
Date: Tue, 6 Jun 2017 20:55:06 +0800
Subject: Fix Compass4nfv workspace permissions

After operation of docker volume, some files will be
changed to root, so they can be clean up by jenkins.
so use 'fix-workspace-permissions' in wrapper

Change-Id: I7b44cae34e52b622cba2881a239e52a62f9c48f4
Signed-off-by: chigang <chigang@huawei.com>
---
 jjb/compass4nfv/compass-ci-jobs.yml       | 7 ++-----
 jjb/compass4nfv/compass-dovetail-jobs.yml | 7 ++-----
 jjb/compass4nfv/compass-verify-jobs.yml   | 3 +++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7d67c37fd..3ba69fab7 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -109,6 +109,7 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - fix-workspace-permissions
 
     parameters:
         - project-parameter:
@@ -206,6 +207,7 @@
         - timeout:
             timeout: 120
             abort: true
+        - fix-workspace-permissions
 
     parameters:
         - project-parameter:
@@ -220,11 +222,6 @@
     scm:
         - git-scm
 
-    wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-
     builders:
         - description-setter:
             description: "POD: $NODE_NAME"
diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml
index c321655d7..966dae50a 100644
--- a/jjb/compass4nfv/compass-dovetail-jobs.yml
+++ b/jjb/compass4nfv/compass-dovetail-jobs.yml
@@ -55,6 +55,7 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - fix-workspace-permissions
 
     triggers:
         - '{auto-trigger-name}'
@@ -137,6 +138,7 @@
         - timeout:
             timeout: 120
             abort: true
+        - fix-workspace-permissions
 
     parameters:
         - project-parameter:
@@ -151,11 +153,6 @@
     scm:
         - git-scm
 
-    wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-
     builders:
         - description-setter:
             description: "POD: $NODE_NAME"
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 60ea3f679..196f4240a 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -79,6 +79,7 @@
         - timeout:
             timeout: 120
             fail: true
+        - fix-workspace-permissions
 
     triggers:
         - gerrit:
@@ -201,6 +202,7 @@
         - timeout:
             timeout: 120
             fail: true
+        - fix-workspace-permissions
 
     triggers:
         - gerrit:
@@ -300,6 +302,7 @@
         - timeout:
             timeout: 120
             fail: true
+        - fix-workspace-permissions
 
     builders:
         - description-setter:
-- 
cgit 1.2.3-korg