From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 2 May 2019 19:50:39 +0000 (-0400)
Subject: jjb: Expand babeltrace gerrit job coverage
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e1875e5987c99137b7142cc2f2591bdce536290d;p=lttng-ci.git

jjb: Expand babeltrace gerrit job coverage

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 9903142..c2d0b1e 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -314,7 +314,25 @@
                   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") || (arch=="amd64")
+    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}'
+
     <<: *babeltrace_build_builders_defaults
     <<: *babeltrace_build_publishers_gerrit
 
@@ -648,7 +666,6 @@
     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]