summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/doctor/doctor.yaml3
-rw-r--r--jjb/global/releng-macros.yaml20
2 files changed, 22 insertions, 1 deletions
diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index e91911194..6a8e07b08 100644
--- 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 b282cff4f..d2da7f625 100644
--- 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"