Skip to content

ci: migrate macOS jobs to tart VM runner #1335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alee1246 wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

ci: migrate macOS jobs to tart VM runner #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3cc1bd
ci: migrate macOS jobs to tart VM runner
alee1246 Jul 8, 2026
5510a33
ci: make Java discoverable for sdkmanager on tart VMs
alee1246 Jul 8, 2026
635e1be
ci: drop explanatory comments from install-android-sdk java export
alee1246 Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ stages:
install-jdk-17:
- brew install openjdk@17
install-android-sdk:
- export JAVA_HOME="/opt/homebrew/opt/openjdk@17"
- export PATH="$JAVA_HOME/bin:$PATH"
- curl -sSL -o commandlinetools.zip https://dl.google.com/android/repository/$ANDROID_SDK_VERSION.zip
- rm -rf ~/android_sdk
- rm -rf ~/cmdline-tools
Expand All @@ -45,7 +47,8 @@ stages:
# TESTS

test:lint:
tags: ['macos:sonoma', 'specific:true']
tags: ['macos:tart']
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
stage: test
rules:
- if: '$BUILD_BENCHMARK != "true"'
Expand All @@ -55,7 +58,8 @@ test:lint:
- yarn run lint

test:js:
tags: ['macos:sonoma', 'specific:true']
tags: ['macos:tart']
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
stage: test
rules:
- if: '$BUILD_BENCHMARK != "true"'
Expand All @@ -66,7 +70,8 @@ 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:tart']
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
stage: test
rules:
- if: '$BUILD_BENCHMARK != "true"'
Expand All @@ -76,7 +81,8 @@ test:build:
- yarn prepare

test:native-android:
tags: ['macos:sonoma', 'specific:true']
tags: ['macos:tart']
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
stage: test
rules:
- if: '$BUILD_BENCHMARK != "true"'
Expand All @@ -94,7 +100,8 @@ 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:tart']
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
stage: test
rules:
- if: '$BUILD_BENCHMARK != "true"'
Expand All @@ -105,7 +112,8 @@ test:native-ios:
- 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

test:native-ios-sr:
tags: ['macos:sonoma', 'specific:true']
tags: ['macos:tart']
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
stage: test
rules:
- if: '$BUILD_BENCHMARK != "true"'
Expand All @@ -116,7 +124,8 @@ test:native-ios-sr:
- 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

test:native-ios-newarch:
tags: ['macos:sonoma', 'specific:true']
tags: ['macos:tart']
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
stage: test
rules:
- if: '$BUILD_BENCHMARK != "true"'
Expand Down
5 changes: 4 additions & 1 deletion benchmarks/.benchmarks-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ stages:
install-jdk-17:
- brew install openjdk@17
install-android-sdk:
- export JAVA_HOME="/opt/homebrew/opt/openjdk@17"
- export PATH="$JAVA_HOME/bin:$PATH"
- curl -sSL -o commandlinetools.zip https://dl.google.com/android/repository/$ANDROID_SDK_VERSION.zip
- rm -rf ~/android_sdk
- rm -rf ~/cmdline-tools
Expand All @@ -60,7 +62,8 @@ stages:

build-and-upload:app:
stage: build-and-upload
tags: ['macos:sonoma', 'specific:true']
tags: ['macos:tart']
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
script:
- !reference [.snippets, install-node]
- !reference [.snippets, install-android-sdk]
Expand Down