From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Fri, 14 May 2021 13:56:48 +0000 (-0400)
Subject: Revert "jjb: tools: mark build as aborted on timeout."
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=932dcd4aaec73dae4fd8e2d3373898d786223941;p=lttng-ci.git

Revert "jjb: tools: mark build as aborted on timeout."

This reverts commit 3b9bb48d192c642d57f678220c236ede3814ddb1.

This can lead to confusing situation where an aborted job due to
timeout is cleaned up by the "dev_mjeanson_system_clean" jobs before a
dev was able to have access the job logs. The current threshold for
cleaning up aborted jobs is 2 hours.

The "abort" notion is also used by the gerrit plugin to "abort" ongoing
build for which a new patch is set.

The most simple way to deal with this ambiguity is to revert this patch
and consider a timeout as a proper failure and let the human figure it
out.

A later patch will also add a timeout job description and update all
post-build actions depending on the aborted status.
---

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 54357a3..1a9488b 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -53,7 +53,7 @@
       - ansicolor
       - timeout:
           timeout: 30
-          abort: true
+          fail: true
           type: no-activity
       - timestamps
       - workspace-cleanup:
@@ -685,7 +685,7 @@
       - ansicolor
       - timeout:
           timeout: 45
-          abort: true
+          fail: true
           type: no-activity
       - timestamps
       - workspace-cleanup:
@@ -715,7 +715,7 @@
       - ansicolor
       - timeout:
           timeout: 10
-          abort: true
+          fail: true
           type: no-activity
       - timestamps