X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=fdb6f29651c294afba29e4221bdfea85f295c1c7;hb=06264d10d51edebfa679449b3e0ef27f4048d733;hp=26e3b01faa4b2bc499c2adc41c0f197458ac2410;hpb=ce1e1df3684463280e8823595be6a481f39bdbc0;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 26e3b01..fdb6f29 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -44,8 +44,9 @@
 
 
 ## Templates
-- job-template:
-    name: babeltrace_{version}_{buildtype}
+
+- babeltrace_version_buildtype_anchor: &babeltrace_version_buildtype_anchor
+    name: 'babeltrace_version_buildtype_anchor'
     defaults: babeltrace
 
     project-type: matrix
@@ -58,10 +59,7 @@
       - axis:
          type: user-defined
          name: conf
-         values:
-          - std
-          - static
-          - python-bindings
+         values: '{obj:conf}'
       - axis:
          type: user-defined
          name: build
@@ -69,8 +67,11 @@
 
     builders:
       - shell:
-         !include-raw-escape scripts/babeltrace/build.sh
+         !include-raw-escape: scripts/babeltrace/build.sh
 
+- job-template:
+    name: babeltrace_{version}_{buildtype}
+    <<: *babeltrace_version_buildtype_anchor
     # TODO: Scan for open tasks
     publishers:
       - tap:
@@ -130,7 +131,7 @@
 
     builders:
       - shell:
-          !include-raw-escape scripts/babeltrace/scan-build.sh
+          !include-raw-escape: scripts/babeltrace/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -159,7 +160,7 @@
               password: COVERITY_SCAN_TOKEN
     builders:
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -183,7 +184,7 @@
            filter: 'build/**'
            target: 'deps/babeltrace'
        - shell:
-          !include-raw-escape scripts/babeltrace/pylint.sh
+          !include-raw-escape: scripts/babeltrace/pylint.sh
 
     publishers:
       - archive:
@@ -209,16 +210,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, ppc64el]
+          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'