X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=5de63d8148524954d440a6252526af86dc31b777;hb=10bbe356323e68a2e206b8ccb8de984933fd1282;hp=99031423f9682a2fb741d6a7056737c40b3e1519;hpb=c871b3d3c859c4c5157bbb439836e94c682d4638;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 9903142..5de63d8 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -314,7 +314,29 @@
                   branch-pattern: '**'
           trigger-for-unreviewed-patches: true
 
-    <<: *babeltrace_build_axes_defaults
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    execution-strategy:
+      combination-filter: |
+        ((build=="std" && conf=="python-bindings" && bt2_mode=="std") || (arch=="amd64")) && (! (arch="amd64" && (build=="oot" || build=="dist") && bt2_mode=="dev"))
+    axes:
+      - axis:
+         type: slave
+         name: arch
+         values: '{obj:arch}'
+      - axis:
+         type: user-defined
+         name: conf
+         values: '{obj:conf}'
+      - axis:
+         type: user-defined
+         name: build
+         values: '{obj:build}'
+      - axis:
+         type: user-defined
+         name: bt2_mode
+         values: '{obj:bt2_mode}'
+
     <<: *babeltrace_build_builders_defaults
     <<: *babeltrace_build_publishers_gerrit
 
@@ -648,7 +670,7 @@
     jobs:
       - 'dev_gerrit_babeltrace_{buildtype}':
           buildtype: build
-          #arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386]
-          arch: !!python/tuple [amd64, i386]
-          build: !!python/tuple [std]
+          arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, python-bindings]
+          bt2_mode: !!python/tuple [dev, std]