diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36485cb44..56c7c0b08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 @@ -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"' @@ -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"' @@ -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"' @@ -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"' @@ -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"' @@ -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"' @@ -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"' diff --git a/benchmarks/.benchmarks-ci.yml b/benchmarks/.benchmarks-ci.yml index 54d851ddf..d0b23a1d7 100644 --- a/benchmarks/.benchmarks-ci.yml +++ b/benchmarks/.benchmarks-ci.yml @@ -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 @@ -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]