clean the workspace in the publisher

As doctor run tox under root user, we need to clean
the workspace in the publisher, otherwise the tests
which come next will be fail when they operate in
the workspace with jenkins user.

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

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index e919111..6a8e07b 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -186,7 +186,6 @@
     name: 'doctor-verify-installer-inspector-builders-macro'
     builders:
       # yamllint disable rule:indentation
-      - 'clean-workspace-log'
       - shell:
           !include-raw:
               - ./doctor-env-presetup.sh
@@ -203,6 +202,7 @@
           # As Jenkins user, it has no permission to send ICMP package
           sudo -E tox -e py34
 
+
 # -------------------------------
 # publisher macros
 # -------------------------------
@@ -212,6 +212,7 @@
       - archive:
           artifacts: 'doctor_tests/*.log'
       - email-jenkins-admins-on-failure
+      - 'post-clean-workspace'
 
 
 #####################################

diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index b282cff..d2da7f6 100644 (file)
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -1014,3 +1014,23 @@
                 - 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"