X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=d30974c3ef15b21d066a0c8a64264115b9387b5c;hb=c8916a7e2d0fbf69c01e88d5d96b4ce37275db55;hp=75ea54f05da8c6ebcf8253f0abc920b22a33256c;hpb=ca8c6144ba2cd9f9dc623c4f1f305ad84e600a7d;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 75ea54f..d30974c 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -58,10 +58,7 @@
       - axis:
          type: user-defined
          name: conf
-         values:
-          - std
-          - static
-          - python_bindings
+         values: '{obj:conf}'
       - axis:
          type: user-defined
          name: build
@@ -69,13 +66,14 @@
 
     builders:
       - shell:
-         !include-raw-escape scripts/babeltrace/build.sh
+         !include-raw-escape: scripts/babeltrace/build.sh
 
     # TODO: Scan for open tasks
     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)'
@@ -89,6 +87,7 @@
           artifacts: 'build/**'
           allow-empty: false
       - ircbot:
+          strategy: new-failure-and-fixed
           matrix-notifier: only-parent
           channels:
             - name: '#lttng'
@@ -128,7 +127,7 @@
 
     builders:
       - shell:
-          !include-raw-escape scripts/babeltrace/scan-build.sh
+          !include-raw-escape: scripts/babeltrace/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -157,7 +156,7 @@
               password: COVERITY_SCAN_TOKEN
     builders:
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -175,13 +174,13 @@
 
     builders:
        - copyartifact:
-           project: babeltrace-{version}/arch=x86-64,build=std,conf=python_bindings
+           project: babeltrace_{version}_build/arch=x86-64,build=std,conf=python-bindings
            which-build: last-successful
            stable: true
            filter: 'build/**'
            target: 'deps/babeltrace'
        - shell:
-          !include-raw-escape scripts/babeltrace/pylint.sh
+          !include-raw-escape: scripts/babeltrace/pylint.sh
 
     publishers:
       - archive:
@@ -207,16 +206,26 @@
 - project:
     name: babeltrace
     version:
-      !include jobs/inc/babeltrace-versions.yaml.inc
+      !include: jobs/inc/babeltrace-versions.yaml.inc
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
+          conf: !!python/tuple [std, static, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: portbuild
-          arch: !!python/tuple [armhf, powerpc]
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
+          conf: !!python/tuple [std, static, python-bindings]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: solarisbuild
+          arch: !!python/tuple [solaris10, solaris11]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static]
+          version:
+            - stable-1.3
+            - master
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
       - 'babeltrace_{version}_pylint'