From 5d0601072e3ba22614f48d06d41d1b4d35e6b6c7 Mon Sep 17 00:00:00 2001 From: "carlos.nogueira" Date: Tue, 18 Aug 2026 10:23:40 +0100 Subject: [PATCH 1/4] Migrate test jobs to macOS Sequoia ARM64 runners --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36485cb44..b42a16611 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ stages: # TESTS test:lint: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -55,7 +55,7 @@ test:lint: - yarn run lint test:js: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -66,7 +66,7 @@ test:js: - NODE_OPTIONS='-r dd-trace/ci/init' DD_ENV=ci DD_SERVICE=dd-sdk-reactnative yarn test test:build: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -76,7 +76,7 @@ test:build: - yarn prepare test:native-android: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -94,7 +94,7 @@ test:native-android: - (cd packages/internal-testing-tools/android && ./gradlew build -PDdSdkReactNative_minSdkVersion=24 -PDatadogInternalTesting_minSdkVersion=24) test:native-ios: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -102,10 +102,10 @@ test:native-ios: script: - yarn - (cd example/ios && RCT_NEW_ARCH_ENABLED=0 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify test:native-ios-sr: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -113,10 +113,10 @@ test:native-ios-sr: script: - yarn - (cd example/ios && RCT_NEW_ARCH_ENABLED=0 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNativeSessionReplay test -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNativeSessionReplay test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify test:native-ios-newarch: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -124,7 +124,7 @@ test:native-ios-newarch: script: - yarn - (cd example-new-architecture/ios && RCT_NEW_ARCH_ENABLED=1 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example-new-architecture/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example-new-architecture/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify benchmark: stage: benchmark From dd0bb6f05b33a822a09d66aef9a3f8fd86a65d69 Mon Sep 17 00:00:00 2001 From: "carlos.nogueira" Date: Mon, 24 Aug 2026 11:30:15 +0100 Subject: [PATCH 2/4] Pin Xcode 16.4 for macOS jobs --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b42a16611..3a9e83a61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ include: variables: GIT_DEPTH: 5 DEVELOP_BRANCH: 'develop' + DEVELOPER_DIR: '/Applications/Xcode-16.4.0.app/Contents/Developer' ANDROID_SDK_VERSION: 'commandlinetools-mac-11076708_latest' EMULATOR_NAME: 'android_emulator' ANDROID_ARCH: 'arm64-v8a' From 8f6add847fd802b64e52a6f40aa588eb0f22b881 Mon Sep 17 00:00:00 2001 From: "carlos.nogueira" Date: Mon, 24 Aug 2026 11:32:29 +0100 Subject: [PATCH 3/4] Extract iOS simulator destination into CI variable --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a9e83a61..97cf6cf06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ variables: GIT_DEPTH: 5 DEVELOP_BRANCH: 'develop' DEVELOPER_DIR: '/Applications/Xcode-16.4.0.app/Contents/Developer' + IOS_SIMULATOR_DESTINATION: 'platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max' ANDROID_SDK_VERSION: 'commandlinetools-mac-11076708_latest' EMULATOR_NAME: 'android_emulator' ANDROID_ARCH: 'arm64-v8a' @@ -103,7 +104,7 @@ test:native-ios: script: - yarn - (cd example/ios && RCT_NEW_ARCH_ENABLED=0 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "$IOS_SIMULATOR_DESTINATION" | xcbeautify test:native-ios-sr: tags: ['macos:sequoia-arm64', 'specific:true'] @@ -114,7 +115,7 @@ test:native-ios-sr: script: - yarn - (cd example/ios && RCT_NEW_ARCH_ENABLED=0 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNativeSessionReplay test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNativeSessionReplay test -destination "$IOS_SIMULATOR_DESTINATION" | xcbeautify test:native-ios-newarch: tags: ['macos:sequoia-arm64', 'specific:true'] @@ -125,7 +126,7 @@ test:native-ios-newarch: script: - yarn - (cd example-new-architecture/ios && RCT_NEW_ARCH_ENABLED=1 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example-new-architecture/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example-new-architecture/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "$IOS_SIMULATOR_DESTINATION" | xcbeautify benchmark: stage: benchmark From b17dd7466c2cf474a23db2a12c7d461b5aa3c370 Mon Sep 17 00:00:00 2001 From: "carlos.nogueira" Date: Tue, 25 Aug 2026 19:11:18 +0100 Subject: [PATCH 4/4] Update benchmarks' gitlab config to use sequoia runners --- benchmarks/.benchmarks-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/.benchmarks-ci.yml b/benchmarks/.benchmarks-ci.yml index 54d851ddf..fe64edf34 100644 --- a/benchmarks/.benchmarks-ci.yml +++ b/benchmarks/.benchmarks-ci.yml @@ -60,7 +60,7 @@ stages: build-and-upload:app: stage: build-and-upload - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] script: - !reference [.snippets, install-node] - !reference [.snippets, install-android-sdk]