Skip to content

Commit 4672e59

Browse files
authored
CSHARP-5087 Bump MacOS version used for tests (mongodb#1324)
1 parent 9eb4dca commit 4672e59

File tree

3 files changed

+24
-26
lines changed

3 files changed

+24
-26
lines changed

build.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22
CAKE_VERSION=2.2.0
3-
DOTNET_VERSION=6.0.400
3+
DOTNET_VERSION=8.0.204

build.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ if [ "$DOTNET_VERSION" != "$DOTNET_INSTALLED_VERSION" ]; then
4747
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 2.1 --architecture x64 --install-dir .dotnet --no-path
4848
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 3.1 --architecture x64 --install-dir .dotnet --no-path
4949
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 5.0 --architecture x64 --install-dir .dotnet --no-path
50-
if [[ ! "$OS" =~ macOS|macos ]]; then # net8 is not supported on macOS 11
51-
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 8.0 --architecture x64 --install-dir .dotnet --no-path
52-
fi
50+
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 6.0 --install-dir .dotnet --no-path
5351
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --install-dir .dotnet --no-path
5452
export PATH="$SCRIPT_DIR/.dotnet":$PATH
5553
export DOTNET_ROOT="$SCRIPT_DIR/.dotnet"

evergreen/evergreen.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,12 @@ functions:
217217
params:
218218
script: |
219219
${PREPARE_SHELL}
220+
if [ "${OS}" = "macos-14-arm64" ]; then
221+
# have to set the limit manually for macos-14-arm, can be removed once DEVPROD-7353 will be solved
222+
ulimit -n 64000
223+
ulimit -a
224+
fi
225+
220226
REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
221227
LOAD_BALANCER=${LOAD_BALANCER} \
222228
MONGODB_VERSION=${VERSION} \
@@ -1867,40 +1873,35 @@ axes:
18671873
display_name: "Windows 64-bit"
18681874
variables:
18691875
OS: "windows-64"
1870-
python3_binary: "C:/python/Python38/python.exe"
18711876
skip_ECS_auth_test: true
18721877
skip_web_identity_auth_test: true
18731878
run_on: windows-64-vs2017-test
18741879
- id: "ubuntu-1804"
18751880
display_name: "Ubuntu 18.04"
18761881
variables:
18771882
OS: "ubuntu-1804"
1878-
python3_binary: "/opt/python/3.8/bin/python3"
18791883
run_on: ubuntu1804-test
18801884
- id: "ubuntu-2004"
18811885
display_name: "Ubuntu 20.04"
18821886
variables:
18831887
OS: "ubuntu-2004"
1884-
python3_binary: "/opt/python/3.8/bin/python3"
18851888
run_on: ubuntu2004-small
1886-
- id: "macos-1100"
1887-
display_name: "macOS 11.00"
1889+
- id: "macos-14"
1890+
display_name: "macOS 14.00"
18881891
variables:
1889-
OS: "macos-1100"
1890-
python3_binary: /Library/Frameworks/Python.framework/Versions/3.8/bin/python3
1892+
OS: "macos-1400"
18911893
skip_EC2_auth_test: true
18921894
skip_ECS_auth_test: true
18931895
skip_web_identity_auth_test: true
1894-
run_on: macos-1100
1895-
- id: "macos-1100-arm64"
1896-
display_name: "macOS 11.00 M1"
1896+
run_on: macos-14
1897+
- id: "macos-14-arm64"
1898+
display_name: "macOS 14.00 ARM"
18971899
variables:
1898-
OS: "macos-1100-arm64"
1899-
python3_binary: /Library/Frameworks/Python.framework/Versions/3.8/bin/python3
1900+
OS: "macos-14-arm64"
19001901
skip_EC2_auth_test: true
19011902
skip_ECS_auth_test: true
19021903
skip_web_identity_auth_test: true
1903-
run_on: macos-1100-arm64
1904+
run_on: macos-14-arm64
19041905

19051906
- id: topology
19061907
display_name: Topology
@@ -2283,7 +2284,7 @@ buildvariants:
22832284
- name: test-netstandard21
22842285

22852286
- matrix_name: "secure-tests-macOS"
2286-
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-1100", "macos-1100-arm64"] }
2287+
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-14", "macos-14-arm64"] }
22872288
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
22882289
tags: ["tests-variant"]
22892290
tasks:
@@ -2316,7 +2317,7 @@ buildvariants:
23162317
- name: test-netstandard21
23172318

23182319
- matrix_name: "unsecure-tests-macOS"
2319-
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-1100", "macos-1100-arm64"] }
2320+
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-14", "macos-14-arm64"] }
23202321
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
23212322
tags: ["tests-variant"]
23222323
tasks:
@@ -2349,7 +2350,7 @@ buildvariants:
23492350
- name: test-netstandard21
23502351

23512352
- matrix_name: "tests-compression-macOS"
2352-
matrix_spec: { compressor : ["snappy", "zstandard"], auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
2353+
matrix_spec: { compressor : ["snappy", "zstandard"], auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", os: ["macos-14", "macos-14-arm64"] }
23532354
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
23542355
tags: ["tests-variant"]
23552356
tasks:
@@ -2421,10 +2422,8 @@ buildvariants:
24212422
- name: aws-auth-tests
24222423

24232424
- matrix_name: aws-auth-tests-macos
2424-
matrix_spec: { version: ["6.0", "7.0", "rapid", "latest"], topology: "standalone", os: "macos-1100" }
2425+
matrix_spec: { version: ["6.0", "7.0", "rapid", "latest"], topology: "standalone", os: "macos-14" }
24252426
display_name: "MONGODB-AWS Auth test ${version} ${os}"
2426-
run_on:
2427-
- macos-1100
24282427
tasks:
24292428
- name: aws-auth-tests
24302429

@@ -2551,7 +2550,7 @@ buildvariants:
25512550
- name: test-csfle-with-mongocryptd-netstandard21
25522551

25532552
- matrix_name: "csfle-with-mocked-kms-tests-macOS"
2554-
matrix_spec: { os: ["macos-1100", "macos-1100-arm64"], ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "rapid", "latest"], topology: ["replicaset"] }
2553+
matrix_spec: { os: ["macos-14", "macos-14-arm64"], ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "rapid", "latest"], topology: ["replicaset"] }
25552554
display_name: "CSFLE Mocked KMS ${version} ${os}"
25562555
tasks:
25572556
- name: test-csfle-with-mocked-kms-tls-netstandard21
@@ -2598,14 +2597,15 @@ buildvariants:
25982597
- name: test-smoke-tests-net80
25992598

26002599
- matrix_name: "smoke-tests-macOS"
2601-
matrix_spec: { os: "macos-1100", ssl: "nossl", version: ["5.0", "6.0", "7.0", "latest"], topology: ["replicaset"] }
2600+
matrix_spec: { os: "macos-14", ssl: "nossl", version: ["5.0", "6.0", "7.0", "latest"], topology: ["replicaset"] }
26022601
display_name: "smoke-tests ${version} ${os}"
26032602
batchtime: 1440 # 1 day
26042603
tasks:
26052604
- name: test-smoke-tests-netcoreapp21
26062605
- name: test-smoke-tests-netcoreapp31
26072606
- name: test-smoke-tests-net50
26082607
- name: test-smoke-tests-net60
2608+
- name: test-smoke-tests-net80
26092609

26102610
# Package release variants
26112611
- matrix_name: build-packages
@@ -2663,4 +2663,4 @@ buildvariants:
26632663
depends_on:
26642664
- name: build-packages
26652665
variant: ".build-packages"
2666-
## add dependency onto packages smoke test once it implemented
2666+
## add dependency onto packages smoke test once it implemented

0 commit comments

Comments
 (0)