Skip to content
Open
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
70 changes: 51 additions & 19 deletions .evergreen/.evg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1736,6 +1736,10 @@ axes:
display_name: "latest"
variables:
VERSION: "latest"
- id: "9.0"
display_name: "9.0"
variables:
VERSION: "9.0"
- id: "8.0"
display_name: "8.0"
variables:
Expand Down Expand Up @@ -1773,9 +1777,15 @@ axes:
- id: "linux"
display_name: "Linux"
run_on: "rhel80-small"
- id: "ubuntu"
display_name: "Ubuntu"
# No single Ubuntu release has server builds for every version we test: 4.4 and 5.0 stop at
# ubuntu2004, while 9.0 starts at ubuntu2204. mongodl infers the download target from the host
# distro and does not fall back to an older target, so the host must match the server release.
- id: "ubuntu2004"
display_name: "Ubuntu 20.04"
run_on: "ubuntu2004-small"
- id: "ubuntu2204"
display_name: "Ubuntu 22.04"
run_on: "ubuntu2204-small"
- id: "windows"
display_name: "Windows"
run_on: "windows-2022-latest-small"
Expand Down Expand Up @@ -2341,7 +2351,7 @@ buildvariants:
#

- matrix_name: "tests-zlib-compression"
matrix_spec: { compressor: "zlib", auth: "noauth", ssl: "nossl", jdk: "jdk8", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "latest" ], topology: "standalone", os: "linux" }
matrix_spec: { compressor: "zlib", auth: "noauth", ssl: "nossl", jdk: "jdk8", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "9.0", "latest" ], topology: "standalone", os: "linux" }
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
tags: [ "tests-variant" ]
tasks:
Expand All @@ -2351,7 +2361,7 @@ buildvariants:
- name: "test-legacy-task"

- matrix_name: "tests-snappy-compression"
matrix_spec: { compressor: "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk8", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "latest" ], topology: "standalone", os: "linux" }
matrix_spec: { compressor: "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk8", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "9.0", "latest" ], topology: "standalone", os: "linux" }
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
tags: [ "tests-variant" ]
tasks:
Expand All @@ -2362,7 +2372,7 @@ buildvariants:

- matrix_name: "tests-zstd-compression"
matrix_spec: { compressor: "zstd", auth: "noauth", ssl: "nossl", jdk: "jdk8",
version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "latest" ],
version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "9.0", "latest" ],
topology: "standalone", os: "linux" }
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
tags: [ "tests-variant" ]
Expand All @@ -2380,7 +2390,7 @@ buildvariants:
- name: "test-bson-and-crypt-task"

- matrix_name: "tests-jdk8-unsecure"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk8", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "latest" ],
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk8", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "9.0", "latest" ],
topology: "*", os: "linux" }
display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
tags: [ "tests-variant" ]
Expand All @@ -2392,7 +2402,7 @@ buildvariants:

- matrix_name: "tests-jdk-secure"
matrix_spec: { auth: "auth", ssl: "ssl", jdk: [ "jdk8", "jdk17", "jdk21" ],
version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "latest" ],
version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "9.0", "latest" ],
topology: "*", os: "linux" }
display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
tags: [ "tests-variant" ]
Expand Down Expand Up @@ -2429,7 +2439,7 @@ buildvariants:
exec_timeout_secs: 7200

- matrix_name: "tests-require-api-version"
matrix_spec: { api-version: "required", auth: "auth", ssl: "nossl", jdk: [ "jdk21" ], version: [ "5.0", "6.0", "7.0", "8.0", "latest" ],
matrix_spec: { api-version: "required", auth: "auth", ssl: "nossl", jdk: [ "jdk21" ], version: [ "5.0", "6.0", "7.0", "8.0", "9.0", "latest" ],
topology: "standalone", os: "linux" }
display_name: "${version} ${topology} ${api-version} "
tags: [ "tests-variant" ]
Expand All @@ -2440,8 +2450,16 @@ buildvariants:
- name: "test-legacy-task"

- matrix_name: "tests-load-balancer-secure"
matrix_spec: { auth: "auth", ssl: "ssl", jdk: [ "jdk21" ], version: [ "5.0", "6.0", "7.0", "8.0", "latest" ], topology: "sharded-cluster",
os: "ubuntu" }
matrix_spec: { auth: "auth", ssl: "ssl", jdk: [ "jdk21" ], version: [ "6.0", "7.0", "8.0", "9.0", "latest" ], topology: "sharded-cluster",
os: "ubuntu2204" }
display_name: "Load Balancer ${version} ${auth} ${ssl} ${jdk} ${os}"
tasks:
- name: "load-balancer-test-task"

# 5.0 has no ubuntu2204 server build, so it stays on ubuntu2004.
- matrix_name: "tests-load-balancer-secure-ubuntu2004"
matrix_spec: { auth: "auth", ssl: "ssl", jdk: [ "jdk21" ], version: [ "5.0" ], topology: "sharded-cluster",
os: "ubuntu2004" }
display_name: "Load Balancer ${version} ${auth} ${ssl} ${jdk} ${os}"
tasks:
- name: "load-balancer-test-task"
Expand Down Expand Up @@ -2500,15 +2518,22 @@ buildvariants:
- name: "gssapi-auth-test-task"

- matrix_name: "aws-auth-test"
matrix_spec: { ssl: "nossl", jdk: [ "jdk8", "jdk17", "jdk21" ], version: [ "4.4", "5.0", "6.0", "7.0", "8.0", "latest" ], os: "ubuntu",
matrix_spec: { ssl: "nossl", jdk: [ "jdk8", "jdk17", "jdk21" ], version: [ "6.0", "7.0", "8.0", "9.0", "latest" ], os: "ubuntu2204",
aws-credential-provider: "*" }
display_name: "MONGODB-AWS Basic Auth test ${version} ${jdk} ${aws-credential-provider}"
tasks:
- name: "aws-auth-test-with-regular-aws-credentials-task"

# 4.4 and 5.0 have no ubuntu2204 server build, so they stay on ubuntu2004.
- matrix_name: "aws-auth-test-ubuntu2004"
matrix_spec: { ssl: "nossl", jdk: [ "jdk8", "jdk17", "jdk21" ], version: [ "4.4", "5.0" ], os: "ubuntu2004",
aws-credential-provider: "*" }
display_name: "MONGODB-AWS Basic Auth test ${version} ${jdk} ${aws-credential-provider}"
run_on: "ubuntu2204-small"
tasks:
- name: "aws-auth-test-with-regular-aws-credentials-task"

- matrix_name: "aws-ec2-auth-test"
matrix_spec: { ssl: "nossl", jdk: [ "jdk21" ], version: [ "7.0" ], os: "ubuntu", aws-credential-provider: "*" }
matrix_spec: { ssl: "nossl", jdk: [ "jdk21" ], version: [ "7.0" ], os: "ubuntu2204", aws-credential-provider: "*" }
display_name: "MONGODB-AWS Advanced Auth test ${version} ${jdk} ${aws-credential-provider}"
run_on: "ubuntu2204-small"
tasks:
Expand All @@ -2519,29 +2544,36 @@ buildvariants:
- name: "aws-auth-test-with-web-identity-credentials-task"

- matrix_name: "accept-api-version-2-test"
matrix_spec: { ssl: "nossl", auth: "noauth", jdk: "jdk21", version: [ "5.0", "6.0", "7.0", "8.0", "latest" ], topology: "standalone",
matrix_spec: { ssl: "nossl", auth: "noauth", jdk: "jdk21", version: [ "5.0", "6.0", "7.0", "8.0", "9.0", "latest" ], topology: "standalone",
os: "linux" }
display_name: "Accept API Version 2 ${version}"
run_on: "ubuntu2204-small"
tasks:
- name: "accept-api-version-2-test-task"

- matrix_name: "ocsp-test"
matrix_spec: { auth: "noauth", ssl: "ssl", jdk: "jdk21", version: [ "4.4", "5.0", "6.0", "7.0", "8.0", "latest" ], os: "ubuntu" }
matrix_spec: { auth: "noauth", ssl: "ssl", jdk: "jdk21", version: [ "6.0", "7.0", "8.0", "9.0", "latest" ], os: "ubuntu2204" }
display_name: "OCSP test ${version} ${os}"
tasks:
- name: ".ocsp"

# 4.4 and 5.0 have no ubuntu2204 server build, so they stay on ubuntu2004.
- matrix_name: "ocsp-test-ubuntu2004"
matrix_spec: { auth: "noauth", ssl: "ssl", jdk: "jdk21", version: [ "4.4", "5.0" ], os: "ubuntu2004" }
display_name: "OCSP test ${version} ${os}"
tasks:
- name: ".ocsp"

- matrix_name: "scala-tests"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: [ "jdk8", "jdk17", "jdk21" ], version: [ "7.0" ], topology: "replicaset",
scala: "*" , os: "ubuntu" }
scala: "*" , os: "ubuntu2204" }
display_name: "${scala} ${jdk} ${version} ${topology} ${os}"
tags: [ "test-scala-variant" ]
tasks:
- name: "scala-test-task"

- matrix_name: "kotlin-tests"
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: [ "jdk8", "jdk17", "jdk21" ], version: [ "7.0" ], topology: "replicaset", os: "ubuntu" }
matrix_spec: { auth: "noauth", ssl: "nossl", jdk: [ "jdk8", "jdk17", "jdk21" ], version: [ "7.0" ], topology: "replicaset", os: "ubuntu2204" }
display_name: "Kotlin: ${jdk} ${version} ${topology} ${os}"
tags: [ "test-kotlin-variant" ]
tasks:
Expand All @@ -2560,14 +2592,14 @@ buildvariants:
- name: ".csfle-aws-from-environment"

- matrix_name: "csfle-tests-with-mongocryptd"
matrix_spec: { os: "linux", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "latest" ], topology: [ "replicaset" ] }
matrix_spec: { os: "linux", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "9.0", "latest" ], topology: [ "replicaset" ] }
display_name: "CSFLE with mongocryptd: ${version}"
tasks:
- name: "csfle-tests-with-mongocryptd-task"

- matrix_name: "csfle-tests-with-mongocryptd-windows"
matrix_spec: { os: "windows",
version: [ "8.0", "latest" ],
version: [ "8.0", "9.0", "latest" ],
topology: [ "replicaset" ] }
display_name: "${os} CSFLE with mongocryptd: ${version}"
tasks:
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

version=5.10.0-SNAPSHOT
version=5.11.0-SNAPSHOT

org.gradle.daemon=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en
Expand Down