X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=0248868a4c3ef738dd08d8cbb6b502880d64094f;hb=b5dc61dec3d9d8612a14999cd7b54064af93f767;hp=d71fb80547b52abb748be61d89876e22f38c3ca8;hpb=f0d7e5b1aab598ec9a6a4b60a092f2a25df711b3;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index d71fb80..0248868 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -53,7 +53,7 @@
       - ansicolor
       - timeout:
           timeout: 30
-          fail: true
+          abort: true
           type: no-activity
       - timestamps
       - workspace-cleanup:
@@ -484,6 +484,15 @@
 - lttng-tools_build_publishers_dev: &lttng-tools_build_publishers_dev
     name: 'lttng-tools_build_publishers_dev'
     publishers:
+      - postbuildscript:
+          mark-unstable-if-failed: false
+          builders:
+            - role: SLAVE
+              build-on:
+                  - ABORTED
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/tap_aborted.sh
       - postbuildscript:
           mark-unstable-if-failed: true
           builders:
@@ -542,6 +551,15 @@
 - lttng-tools_build_publishers_prod: &lttng-tools_build_publishers_prod
     name: 'lttng-tools_build_publishers_prod'
     publishers:
+      - postbuildscript:
+          mark-unstable-if-failed: false
+          builders:
+            - role: SLAVE
+              build-on:
+                  - ABORTED
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/tap_aborted.sh
       - postbuildscript:
           mark-unstable-if-failed: true
           builders:
@@ -667,7 +685,7 @@
       - ansicolor
       - timeout:
           timeout: 45
-          fail: true
+          abort: true
           type: no-activity
       - timestamps
       - workspace-cleanup:
@@ -697,7 +715,7 @@
       - ansicolor
       - timeout:
           timeout: 10
-          fail: true
+          abort: true
           type: no-activity
       - timestamps
 
@@ -764,6 +782,15 @@
     <<: *lttng-tools_build_builders_gerrit
 
     publishers:
+      - postbuildscript:
+          mark-unstable-if-failed: false
+          builders:
+            - role: SLAVE
+              build-on:
+                  - ABORTED
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/tap_aborted.sh
       - postbuildscript:
           mark-unstable-if-failed: true
           builders:
@@ -906,6 +933,15 @@
           !include-raw-escape: scripts/lttng-tools/release.sh
 
     publishers:
+      - postbuildscript:
+          mark-unstable-if-failed: false
+          builders:
+            - role: SLAVE
+              build-on:
+                  - ABORTED
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/tap_aborted.sh
       - postbuildscript:
           mark-unstable-if-failed: true
           builders:
@@ -1105,7 +1141,7 @@
           buildtype: slesbuild
           version: master
           ustversion: master
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [master]
@@ -1134,17 +1170,6 @@
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
           filter: ''
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
-          version: master
-          ustversion: master
-          arch: !!python/tuple [sol10-i386, sol11-i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
       - 'lttng-tools_{version}_winbuild':
           version: master
           ustversion: master
@@ -1205,7 +1230,7 @@
           buildtype: slesbuild
           version: stable-2.12
           ustversion: stable-2.12
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.12]
@@ -1223,17 +1248,6 @@
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: ''
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
-          version: stable-2.12
-          ustversion: stable-2.12
-          arch: !!python/tuple [sol10-i386, sol11-i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.12]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: macosbuild
           version: stable-2.12
@@ -1310,7 +1324,7 @@
           buildtype: slesbuild
           version: stable-2.11
           ustversion: stable-2.11
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.10]
@@ -1328,17 +1342,6 @@
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
           filter: ''
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          arch: !!python/tuple [sol10-i386, sol11-i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.10]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: macosbuild
           version: stable-2.11
@@ -1415,7 +1418,7 @@
           buildtype: slesbuild
           version: stable-2.10
           ustversion: stable-2.10
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1433,17 +1436,6 @@
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
           filter: ''
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          arch: !!python/tuple [sol10-i386, sol11-i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: macosbuild
           version: stable-2.10
@@ -1487,7 +1479,7 @@
           buildtype: slesbuild
           version: stable-2.9
           ustversion: stable-2.9
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1500,7 +1492,7 @@
           buildtype: slesbuild
           version: stable-2.8
           ustversion: stable-2.8
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1632,17 +1624,6 @@
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
           filter: ''
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
-          version: master-staging
-          ustversion: master
-          arch: !!python/tuple [sol10-i386, sol11-i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
 
 - project:
     name: gerrit-lttng-tools