diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index 245fd0fa42..af488ce448 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -2398,7 +2398,15 @@ buildvariants: - name: test-net60 - matrix_name: "secure-tests-macOS" - matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-14", "macos-14-arm64"] } + matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: "macos-14" } + display_name: "${version} ${topology} ${auth} ${ssl} ${os}" + tags: ["tests-variant"] + tasks: + - name: test-netstandard21 + - name: test-net60 + +- matrix_name: "secure-tests-macOS-arm64" + matrix_spec: { version: ["6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: "macos-14-arm64" } display_name: "${version} ${topology} ${auth} ${ssl} ${os}" tags: ["tests-variant"] tasks: @@ -2432,7 +2440,15 @@ buildvariants: - name: test-net60 - matrix_name: "unsecure-tests-macOS" - matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-14", "macos-14-arm64"] } + matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: "macos-14" } + display_name: "${version} ${topology} ${auth} ${ssl} ${os}" + tags: ["tests-variant"] + tasks: + - name: test-netstandard21 + - name: test-net60 + +- matrix_name: "unsecure-tests-macOS-arm64" + matrix_spec: { version: ["6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: "macos-14-arm64" } display_name: "${version} ${topology} ${auth} ${ssl} ${os}" tags: ["tests-variant"] tasks: @@ -2667,7 +2683,16 @@ buildvariants: - name: test-csfle-with-mongocryptd-net60 - matrix_name: "csfle-with-mocked-kms-tests-macOS" - matrix_spec: { os: ["macos-14", "macos-14-arm64"], ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] } + matrix_spec: { os: "macos-14", ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] } + display_name: "CSFLE Mocked KMS ${version} ${os}" + tasks: + - name: test-csfle-with-mocked-kms-tls-netstandard21 + - name: test-csfle-with-mocked-kms-tls-net60 + - name: test-csfle-with-mongocryptd-netstandard21 + - name: test-csfle-with-mongocryptd-net60 + +- matrix_name: "csfle-with-mocked-kms-tests-macOS-arm64" + matrix_spec: { os: "macos-14-arm64", ssl: "nossl", version: ["6.0", "7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] } display_name: "CSFLE Mocked KMS ${version} ${os}" tasks: - name: test-csfle-with-mocked-kms-tls-netstandard21