X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=ec6423900beda88d4f66017fdeb76ff83030b027;hb=8a02037bf9bc1e630ad4dfe43ba2193dd3dd9481;hp=a22237b5622036ecbb215e74b7cfcedc49f91c51;hpb=51c9c62db1805a4cdd96be18df4082f1ac5d81c5;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index a22237b..ec64239 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -697,7 +697,7 @@
           conf: !!python/tuple [std, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
@@ -706,13 +706,13 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
-          buildtype: solarisbuild
-          arch: !!python/tuple [sol10-i386, sol11-i386]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, static]
+          conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: freebsdbuild
+          arch: !!python/tuple [freebsd]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_{cctype}':
@@ -751,7 +751,7 @@
           conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{buildtype}':
@@ -760,8 +760,13 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: freebsdbuild
+          arch: !!python/tuple [freebsd]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{cctype}':
@@ -796,8 +801,8 @@
           conf: !!python/tuple [std, static, prod, min]
           filter: '(build=="std" && conf=="std") || (arch=="amd64")'
       - 'dev_gerrit_babeltrace_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
           filter: ''
@@ -823,8 +828,8 @@
           build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, static, python-bindings]
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
 
@@ -848,8 +853,8 @@
           build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, static, prod, min]
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]