From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Mon, 6 Aug 2018 09:00:52 +0000 (+0000)
Subject: Merge "use 'workspace-cleanup' plugin in publisher"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f5cd7e63ddd9b84e99708dd2bc55a1c4da3b28eb;hp=3b5a3df47ff8d7580ec2df5f0a6b0cd2bd29cf02;p=releng.git

Merge "use 'workspace-cleanup' plugin in publisher"
---

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 6a8e07b08..dae280e7d 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -212,8 +212,7 @@
       - archive:
           artifacts: 'doctor_tests/*.log'
       - email-jenkins-admins-on-failure
-      - 'post-clean-workspace'
-
+      - workspace-cleanup
 
 #####################################
 # trigger macros
diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index d2da7f625..b282cff4f 100644
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -1014,23 +1014,3 @@
                 - shell:
                     !include-raw: installer-report.sh
           mark-unstable-if-failed: true
-
-- publisher:
-    name: 'post-clean-workspace'
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: SLAVE
-              build-on:
-                - ABORTED
-                - FAILURE
-                - NOT_BUILT
-                - UNSTABLE
-                - SUCCESS
-              build-steps:
-                - shell: |
-                    #!/bin/bash
-                    set -o errexit
-                    set -o nounset
-                    set -o pipefail
-                    sudo /bin/rm -rf "$WORKSPACE"