From 40430e73d17a54c44056d0197d36d7c4b759af63 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Fri, 14 May 2021 10:21:03 -0400 Subject: [PATCH] jjb: lttng-tools: adjust post-build action to act on failure instead of abort Signed-off-by: Jonathan Rajotte --- jobs/lttng-tools.yaml | 14 +++++++------- .../lttng-tools/{tap_aborted.sh => tap_failure.sh} | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) rename scripts/lttng-tools/{tap_aborted.sh => tap_failure.sh} (89%) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 58164d5..dcaa531 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -490,10 +490,10 @@ builders: - role: SLAVE build-on: - - ABORTED + - FAILURE build-steps: - shell: - !include-raw-escape: scripts/lttng-tools/tap_aborted.sh + !include-raw-escape: scripts/lttng-tools/tap_failure.sh - postbuildscript: mark-unstable-if-failed: true builders: @@ -557,10 +557,10 @@ builders: - role: SLAVE build-on: - - ABORTED + - FAILURE build-steps: - shell: - !include-raw-escape: scripts/lttng-tools/tap_aborted.sh + !include-raw-escape: scripts/lttng-tools/tap_failure.sh - postbuildscript: mark-unstable-if-failed: true builders: @@ -790,10 +790,10 @@ builders: - role: SLAVE build-on: - - ABORTED + - FAILURE build-steps: - shell: - !include-raw-escape: scripts/lttng-tools/tap_aborted.sh + !include-raw-escape: scripts/lttng-tools/tap_failure.sh - postbuildscript: mark-unstable-if-failed: true builders: @@ -944,7 +944,7 @@ - ABORTED build-steps: - shell: - !include-raw-escape: scripts/lttng-tools/tap_aborted.sh + !include-raw-escape: scripts/lttng-tools/tap_failure.sh - postbuildscript: mark-unstable-if-failed: true builders: diff --git a/scripts/lttng-tools/tap_aborted.sh b/scripts/lttng-tools/tap_failure.sh similarity index 89% rename from scripts/lttng-tools/tap_aborted.sh rename to scripts/lttng-tools/tap_failure.sh index 07bbaa4..64f17b5 100755 --- a/scripts/lttng-tools/tap_aborted.sh +++ b/scripts/lttng-tools/tap_failure.sh @@ -14,6 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# This script is necessary since that for job failure due to timeout, the +# gathering of tap log will not have been executed. set -exu # Required variables -- 2.34.1