Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ trim_trailing_whitespace = true
[project.json]
indent_size = 2

[*.yml]
indent_size = 2

# C# files
[*.cs]
# New line preferences
Expand Down
46 changes: 25 additions & 21 deletions evergreen/evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ functions:
export FLE_AZURE_CLIENT_ID=${FLE_AZURE_CLIENT_ID}
export FLE_AZURE_CLIENT_SECRET=${FLE_AZURE_CLIENT_SECRET}
export FLE_GCP_EMAIL=${FLE_GCP_EMAIL}
export FLE_GCP_PRIVATE_KEY=${FLE_GCP_PRIVATE_KEY}
export FLE_GCP_PRIVATE_KEY=${FLE_GCP_PRIVATE_KEY}
set -o xtrace # Enable tracing.
EOT
# Do not output expansion.yml contents after this point
Expand Down Expand Up @@ -584,7 +584,7 @@ functions:
if [ "${skip_web_identity_auth_test}" = "true" ]; then
echo "This platform does not support the web identity auth test, skipping..."
exit 0
fi
fi
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
export AWS_ROLE_ARN="${iam_auth_assume_web_role_name}"
Expand All @@ -611,7 +611,7 @@ functions:
if [ "${skip_EC2_auth_test}" = "true" ]; then
echo "This platform does not support the web identity auth test, skipping..."
exit 0
fi
fi
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
export AWS_ROLE_ARN="${iam_auth_assume_web_role_name}"
Expand Down Expand Up @@ -1678,6 +1678,10 @@ axes:
display_name: "rapid"
variables:
VERSION: "rapid"
- id: "7.0"
display_name: "7.0"
variables:
VERSION: "7.0"
- id: "6.0"
display_name: "6.0"
variables:
Expand Down Expand Up @@ -1926,7 +1930,7 @@ buildvariants:
- name: test-netstandard21

- matrix_name: "tests-snappy-compression-macOS"
matrix_spec: { compressor : "snappy", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
matrix_spec: { compressor : "snappy", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
tags: ["tests-variant"]
tasks:
Expand All @@ -1950,15 +1954,15 @@ buildvariants:
- name: test-netstandard21

- matrix_name: "tests-zstandard-compression-macOS"
matrix_spec: { compressor : "zstandard", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
matrix_spec: { compressor : "zstandard", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
tags: ["tests-variant"]
tasks:
- name: test-netstandard21

# ubuntu 18 does not support SSL until 4.0
- matrix_name: "secure-tests-linux"
matrix_spec: { version: ["4.0", "4.2", "4.4", "5.0", "6.0", "rapid", "latest"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-1804" }
matrix_spec: { version: ["4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "rapid", "latest"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-1804" }
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
tags: ["tests-variant"]
tasks:
Expand All @@ -1974,14 +1978,14 @@ buildvariants:
- name: test-netstandard21

- matrix_name: "secure-tests-macOS"
matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-1100", "macos-1100-arm64"] }
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-1100", "macos-1100-arm64"] }
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
tags: ["tests-variant"]
tasks:
- name: test-netstandard21

- matrix_name: "unsecure-tests-macOS"
matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-1100", "macos-1100-arm64"] }
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-1100", "macos-1100-arm64"] }
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
tags: ["tests-variant"]
tasks:
Expand All @@ -1996,38 +2000,38 @@ buildvariants:
- name: test-netstandard21

- matrix_name: "ocsp-tests"
matrix_spec: { version: ["4.4", "5.0", "6.0", "rapid", "latest"], auth: "noauth", ssl: "ssl", topology: "standalone", os: "windows-64" }
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "rapid", "latest"], auth: "noauth", ssl: "ssl", topology: "standalone", os: "windows-64" }
display_name: "OCSP ${version} ${os}"
batchtime: 20160 # 14 days
tasks:
- name: ".ocsp"

- matrix_name: aws-auth-tests-windows
matrix_spec: { version: ["4.4", "5.0", "6.0", "rapid", "latest"], topology: "standalone", os: "windows-64" }
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", os: "windows-64" }
display_name: "MONGODB-AWS Auth test ${version} ${os}"
run_on:
- windows-64-vs2017-test
tasks:
- name: aws-auth-tests

- matrix_name: aws-auth-tests-linux
matrix_spec: { version: ["6.0", "rapid", "latest"], topology: "standalone", os: "ubuntu-1804" }
matrix_spec: { version: ["6.0", "7.0", "rapid", "latest"], topology: "standalone", os: "ubuntu-1804" }
display_name: "MONGODB-AWS Auth test ${version} ${os}"
run_on:
- ubuntu1804-test
tasks:
- name: aws-auth-tests

- matrix_name: aws-auth-tests-macos
matrix_spec: { version: ["6.0", "rapid", "latest"], topology: "standalone", os: "macos-1100" }
matrix_spec: { version: ["6.0", "7.0", "rapid", "latest"], topology: "standalone", os: "macos-1100" }
display_name: "MONGODB-AWS Auth test ${version} ${os}"
run_on:
- macos-1100
tasks:
- name: aws-auth-tests

- matrix_name: stable-api-tests
matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", auth: "auth", ssl: "nossl", os: "windows-64" }
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", auth: "auth", ssl: "nossl", os: "windows-64" }
display_name: "Stable API ${version} ${topology} ${auth} ${ssl} ${os}"
run_on:
- windows-64-vs2017-test
Expand All @@ -2043,14 +2047,14 @@ buildvariants:
- name: plain-auth-tests

- matrix_name: load-balancer-tests
matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], auth: "noauth", ssl: "nossl", topology: "sharded-cluster", os: "ubuntu-1804" }
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], auth: "noauth", ssl: "nossl", topology: "sharded-cluster", os: "ubuntu-1804" }
display_name: "Load Balancer ${version} ${auth} ${ssl} ${os}"
tasks:
- name: "test-load-balancer-netstandard20"
- name: "test-load-balancer-netstandard21"

- matrix_name: load-balancer-tests-secure
matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], auth: "auth", ssl: "ssl", topology: "sharded-cluster", os: "ubuntu-1804" }
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], auth: "auth", ssl: "ssl", topology: "sharded-cluster", os: "ubuntu-1804" }
display_name: "Load Balancer ${version} ${auth} ${ssl} ${os}"
tasks:
- name: "test-load-balancer-netstandard20"
Expand Down Expand Up @@ -2110,7 +2114,7 @@ buildvariants:
- name: test-gssapi-netstandard21

- matrix_name: "csfle-with-mocked-kms-tests-windows"
matrix_spec: { os: "windows-64", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] }
matrix_spec: { os: "windows-64", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "rapid", "latest" ], topology: ["replicaset"] }
display_name: "CSFLE Mocked KMS ${version} ${os}"
tasks:
- name: test-csfle-with-mocked-kms-tls-net472
Expand All @@ -2121,7 +2125,7 @@ buildvariants:
- name: test-csfle-with-mongocryptd-netstandard21

- matrix_name: "csfle-with-mocked-kms-tests-linux"
matrix_spec: { os: "ubuntu-1804", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] }
matrix_spec: { os: "ubuntu-1804", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "rapid", "latest" ], topology: ["replicaset"] }
display_name: "CSFLE Mocked KMS ${version} ${os}"
tasks:
- name: test-csfle-with-mocked-kms-tls-netstandard20
Expand All @@ -2130,7 +2134,7 @@ buildvariants:
- name: test-csfle-with-mongocryptd-netstandard21

- matrix_name: "csfle-with-mocked-kms-tests-macOS"
matrix_spec: { os: [ "macos-1100", "macos-1100-arm64" ], ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] }
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"] }
display_name: "CSFLE Mocked KMS ${version} ${os}"
tasks:
- name: test-csfle-with-mocked-kms-tls-netstandard21
Expand All @@ -2153,7 +2157,7 @@ buildvariants:
- name: test-csfle-with-mongocryptd-netstandard21

- matrix_name: "smoke-tests-windows"
matrix_spec: { os: "windows-64", ssl: "nossl", version: [ "5.0", "6.0", "latest" ], topology: ["replicaset"] }
matrix_spec: { os: "windows-64", ssl: "nossl", version: [ "5.0", "6.0", "7.0", "latest" ], topology: ["replicaset"] }
display_name: "smoke-tests ${version} ${os}"
batchtime: 1440 # 1 day
tasks:
Expand All @@ -2164,7 +2168,7 @@ buildvariants:
- name: test-smoke-tests-net60

- matrix_name: "smoke-tests-linux"
matrix_spec: { os: "ubuntu-1804", ssl: "nossl", version: [ "5.0", "6.0", "latest" ], topology: ["replicaset"] }
matrix_spec: { os: "ubuntu-1804", ssl: "nossl", version: [ "5.0", "6.0", "7.0", "latest" ], topology: ["replicaset"] }
display_name: "smoke-tests ${version} ${os}"
batchtime: 1440 # 1 day
tasks:
Expand All @@ -2174,7 +2178,7 @@ buildvariants:
- name: test-smoke-tests-net60

- matrix_name: "smoke-tests-macOS"
matrix_spec: { os: "macos-1100", ssl: "nossl", version: [ "5.0", "6.0", "latest" ], topology: ["replicaset"] }
matrix_spec: { os: "macos-1100", ssl: "nossl", version: [ "5.0", "6.0", "7.0", "latest" ], topology: ["replicaset"] }
display_name: "smoke-tests ${version} ${os}"
batchtime: 1440 # 1 day
tasks:
Expand Down