use 'workspace-cleanup' plugin in publisher

Change-Id: I4db7c0cda5485dbc756a22b9cbde298612241274
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 6a8e07b..dae280e 100644 (file)
--- 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 d2da7f6..b282cff 100644 (file)
--- 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"