X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=ec6423900beda88d4f66017fdeb76ff83030b027;hb=3b9bb48d192c642d57f678220c236ede3814ddb1;hp=ca6f33961a1b0d73b28b6d93f9f223e9e9bd96da;hpb=894db5f110d0650f303b539b07866a238ba20228;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index ca6f339..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,8 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
-          buildtype: solarisbuild
-          arch: !!python/tuple [sol10-i386, sol11-i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std, static]
-      - '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]
       - 'babeltrace_{version}_{buildtype}':
@@ -756,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}':
@@ -765,8 +760,8 @@
           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}':
@@ -806,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: ''
@@ -833,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]
 
@@ -858,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]