jjb: Update MacOS jobs for Big Sur and arm64

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

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index ca6f33961a1b0d73b28b6d93f9f223e9e9bd96da..a263c88a90a4b17798d8fa9a8697d5b663418367 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -711,8 +711,8 @@
           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}':
@@ -765,8 +765,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 +806,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 +833,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 +858,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]
 

diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml
index 7a7541ef45dd6fe20133f7a0c3fe40b90dc6d50d..bc8d95d6aec8da86a5ffc5172830ab3b0ddebc5c 100644 (file)
--- a/jobs/liburcu.yaml
+++ b/jobs/liburcu.yaml
@@ -359,10 +359,10 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static, tls_fallback, debug-rcu]
       - 'liburcu_{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, static, tls_fallback, debug-rcu]
+          conf: !!python/tuple [std]
       - 'liburcu_{version}_winbuild':
           arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]

diff --git a/jobs/lttng-scope.yaml b/jobs/lttng-scope.yaml
index b7eaf3d8ec2918d0206735f987f5f530d2b70247..4c4c2945cfd94f871885c60b8a9e2c0cbea59bf4 100644 (file)
--- a/jobs/lttng-scope.yaml
+++ b/jobs/lttng-scope.yaml
@@ -236,7 +236,7 @@
 
 
 - job-template:
-    name: lttng-scope_{version}_macosxbuild
+    name: lttng-scope_{version}_macosbuild
     defaults: lttng-scope
 
     project-type: matrix
@@ -395,7 +395,7 @@
 #          arch: !!python/tuple [i386, amd64]
 #      - 'lttng-scope_{version}_winbuild':
 #          arch: !!python/tuple [win64]
-#      - 'lttng-scope_{version}_macosxbuild':
-#          arch: !!python/tuple [macosx]
+#      - 'lttng-scope_{version}_macosbuild':
+#          arch: !!python/tuple [macos]
 #      - 'lttng-scope_{version}_coverity':
 #          version: master

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 98f887f4b143f89d1ddf490d2a0ad40b5f6897ff..d71fb80547b52abb748be61d89876e22f38c3ca8 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -1124,10 +1124,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: macosbuild
           version: master
           ustversion: master
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
@@ -1235,10 +1235,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: macosbuild
           version: stable-2.12
           ustversion: stable-2.12
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.12]
@@ -1340,10 +1340,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: macosbuild
           version: stable-2.11
           ustversion: stable-2.11
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.10]
@@ -1445,10 +1445,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: macosbuild
           version: stable-2.10
           ustversion: stable-2.10
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1622,10 +1622,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: macosbuild
           version: master-staging
           ustversion: master
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 8fe9fd8e4ded5dacf26f3fdaa91421a0e18ade81..614062ae72a3162c3e55866946a4dfc86ec4c5ce 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -188,7 +188,7 @@ sol11-i386)
     export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
     ;;
 
-macosx)
+macos*)
     export MAKE=make
     export TAR=tar
     export NPROC="getconf _NPROCESSORS_ONLN"
@@ -252,6 +252,13 @@ export BABELTRACE_MINIMAL_LOG_LEVEL=TRACE
 # Set configure options and environment variables for each build
 # configuration.
 CONF_OPTS=("--prefix=$PREFIX")
+
+# -Werror is enabled by default in stable-2.0 but won't be in 2.1
+# Explicitly disable it for consistency.
+if vergte "$PACKAGE_VERSION" "2.0"; then
+       CONF_OPTS+=("--disable-Werror")
+fi
+
 case "$conf" in
 static)
     echo "Static lib only configuration"

diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index b589d4bb0e6925b63670e101f9cb3019f5a9c16f..ed976297c1f41af719bde137732ac62f0dee9776 100755 (executable)
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -189,7 +189,7 @@ sol11-i386)
     export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
     ;;
 
-macosx)
+macos*)
     export MAKE=make
     export TAR=tar
     export NPROC="getconf _NPROCESSORS_ONLN"

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 394575c1cb162ffd25332a6ad753cca881f707f4..caa48f5c8f6476b901eb99eced5497100e9d0b2a 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -225,7 +225,7 @@ sol11-i386)
     RUN_TESTS="no"
     ;;
 
-macosx)
+macos*)
     export MAKE=make
     export TAR=tar
     export NPROC="getconf _NPROCESSORS_ONLN"