Merge pull request #28 from PSRCode/yaml_publisher_anchor

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

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index c650db589d4b7435ff5cdc6de45befd324d3986e..fe2e450cba6332f085d6ae3e83f9db7edc5039cd 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -148,6 +148,19 @@
 - babeltrace_build_publishers_prod: &babeltrace_build_publishers_prod
     name: 'babeltrace_build_publishers_prod'
     publishers:
+      - tap:
+          results: 'tap/**/*.log'
+          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
       - archive:
           artifacts: 'build/**'
           allow-empty: false
@@ -165,7 +178,6 @@
 
     <<: *babeltrace_build_axes_defaults
     <<: *babeltrace_build_builders_defaults
-    <<: *babeltrace_build_publishers_defaults
     <<: *babeltrace_build_publishers_prod
 
 - job-template:
@@ -174,7 +186,6 @@
 
     <<: *babeltrace_build_axes_defaults
     <<: *babeltrace_build_builders_win
-    <<: *babeltrace_build_publishers_defaults
     <<: *babeltrace_build_publishers_prod
 
 - job-template:

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index a70ec9405b40bbb509e2329499ff3c13ba33825f..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: