jjb: move to NoActivity timeouts

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 9945075a1666bcc2194e70ef0998cef0a1f65bd6..7b3974ecc6bd524bf0303137edd73ef19b2b971b 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -17,9 +17,9 @@
     wrappers:
       - ansicolor
       - timeout:
-          timeout: 90
+          timeout: 20
           fail: true
-          type: absolute
+          type: no-activity
       - timestamps
       - workspace-cleanup:
           clean-if:

diff --git a/jobs/librseq.yaml b/jobs/librseq.yaml
index 193daafdf855d80876960967140eade02abad094..db7fa74d27d650a02e394a7b18c4ee35fdf54a36 100644 (file)
--- a/jobs/librseq.yaml
+++ b/jobs/librseq.yaml
@@ -22,7 +22,7 @@
       - timeout:
           timeout: 10
           fail: true
-          type: absolute
+          type: no-activity
       - timestamps
       - workspace-cleanup:
           clean-if:
@@ -232,9 +232,9 @@
     wrappers:
       - ansicolor
       - timeout:
-          timeout: 60
+          timeout: 10
           fail: true
-          type: absolute
+          type: no-activity
       - timestamps
       - workspace-cleanup:
           clean-if:

diff --git a/jobs/linux-rseq.yaml b/jobs/linux-rseq.yaml
index 951b1cf5da20179dbdb3b57478c6c54b214fe874..966fa0e9ffa0343c96bfc242b916bf61a35092e8 100644 (file)
--- a/jobs/linux-rseq.yaml
+++ b/jobs/linux-rseq.yaml
@@ -9,9 +9,9 @@
     wrappers:
       - ansicolor
       - timeout:
-          timeout: 90
+          timeout: 10
           fail: true
-          type: absolute
+          type: no-activity
       - timestamps
       - workspace-cleanup:
           clean-if:
@@ -50,9 +50,9 @@
     wrappers:
       - ansicolor
       - timeout:
-          timeout: 180
+          timeout: 10
           fail: true
-          type: absolute
+          type: no-activity
       - timestamps
       - workspace-cleanup:
           clean-if:

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 56c00880adeeb0cb51f103c4090ea1f7ceb945d6..e34ce99816d47161b848e45a28e6681f82010f80 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -14,7 +14,7 @@
       - ansicolor
       - timeout:
           timeout: 30
-          abort: true
+          fail: true
           type: no-activity
       - timestamps
       - workspace-cleanup: