Fix: YAML does not support object merging or array merging for anchor

[lttng-ci.git] / jobs / lttng-tools.yaml

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index ba4c6011412ae349adcdba0d42d740926f14fdb0..1d242c8a352c772ea6684aa4dbcdd0463450c57b 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -297,6 +297,22 @@
 - lttng-tools_build_publishers_prod: &lttng-tools_build_publishers_prod
     name: 'lttng-tools_build_publishers_prod'
     publishers:
+      - tap:
+          results: 'tap/**/*.tap'
+          failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
+      - warnings:
+          console-log-parsers:
+            - 'GNU Make + GNU C Compiler (gcc)'
+          total-thresholds:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
       - archive:
           artifacts: 'build/**'
           allow-empty: false
@@ -314,7 +330,6 @@
 
     <<: *lttng-tools_build_axes_defaults
     <<: *lttng-tools_build_builders_defaults
-    <<: *lttng-tools_build_publishers_defaults
     <<: *lttng-tools_build_publishers_prod
 
     triggers:
@@ -330,7 +345,6 @@
 
     <<: *lttng-tools_build_axes_defaults
     <<: *lttng-tools_build_builders_win
-    <<: *lttng-tools_build_publishers_defaults
     <<: *lttng-tools_build_publishers_prod
 
 - job-template:
@@ -535,7 +549,7 @@
           buildtype: solarisbuild
           version: master
           ustversion: master
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
@@ -581,7 +595,7 @@
           buildtype: solarisbuild
           version: stable-2.10
           ustversion: stable-2.10
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
@@ -636,7 +650,7 @@
           buildtype: solarisbuild
           version: stable-2.9
           ustversion: stable-2.9
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
@@ -691,7 +705,7 @@
           buildtype: solarisbuild
           version: stable-2.8
           ustversion: stable-2.8
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
@@ -706,7 +720,7 @@
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, no-ust, agents, debug-rcu]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.7
@@ -715,7 +729,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.7
@@ -724,7 +738,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.5]
 
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
@@ -804,7 +818,7 @@
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: master-staging
@@ -849,7 +863,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           buildtype: macosxbuild
           version: master-staging
@@ -863,7 +877,7 @@
           buildtype: solarisbuild
           version: master-staging
           ustversion: master
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]