diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2018-08-06 08:37:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-06 08:37:41 +0000 |
| commit | 3b5a3df47ff8d7580ec2df5f0a6b0cd2bd29cf02 (patch) | |
| tree | 86efb028691eb24d7b50d9cdedc0349114e19cbe | |
| parent | 0e0dda750278d88e89ba348cdf489a910cd40054 (diff) | |
| parent | 3aaed5cf40092744f1b87680b9205a2901baecf3 (diff) | |
Merge "clean the workspace in the publisher"
| -rw-r--r-- | jjb/doctor/doctor.yaml | 3 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yaml | 20 |
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" |