diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml index 67ec7fd4dd3..6e2e41e7ebe 100644 --- a/.evergreen/.evg.yml +++ b/.evergreen/.evg.yml @@ -1603,6 +1603,13 @@ axes: # Multiple mongos instances can be specified in the connection string # for this version. SAFE_FOR_MULTI_MONGOS: true + - id: "7.0" + display_name: "7.0" + variables: + VERSION: "7.0" + # Multiple mongos instances can be specified in the connection string + # for this version. + SAFE_FOR_MULTI_MONGOS: true - id: "6.0" display_name: "6.0" variables: @@ -1897,7 +1904,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", "latest"], + version: ["4.2", "4.4", "5.0", "6.0", "7.0", "latest"], topology: "standalone", os: "linux" } display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} " tags: ["tests-variant"] @@ -1905,7 +1912,7 @@ buildvariants: - name: "test" - matrix_name: "tests-jdk8-unsecure" - matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk8", version: ["3.6", "4.0", "4.2", "4.4", "5.0", "6.0", "latest"], + matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk8", version: ["3.6", "4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "latest"], topology: "*", os: "linux" } display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} " tags: ["tests-variant"] @@ -1913,7 +1920,7 @@ buildvariants: - name: "test" - matrix_name: "tests-jdk-secure" - matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk8", "jdk17"], version: ["3.6", "4.0", "4.2", "4.4", "5.0", "6.0", "latest"], + matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk8", "jdk17"], version: ["3.6", "4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "latest"], topology: ["replicaset", "sharded-cluster"], os: "linux" } display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} " tags: ["tests-variant"] @@ -1921,21 +1928,21 @@ buildvariants: - name: "test" - matrix_name: "tests-jdk-secure-jdk11" - matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk11"], version: ["6.0"], topology: ["replicaset"], os: "linux" } + matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk11"], version: ["7.0"], topology: ["replicaset"], os: "linux" } display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} " tags: ["tests-variant"] tasks: - name: "test" - matrix_name: "tests-require-api-version" - matrix_spec: { api-version: "required", auth: "auth", ssl: "nossl", jdk: ["jdk17"], version: ["5.0", "6.0", "latest"], topology: "standalone", os: "linux" } + matrix_spec: { api-version: "required", auth: "auth", ssl: "nossl", jdk: ["jdk17"], version: ["5.0", "6.0", "7.0", "latest"], topology: "standalone", os: "linux" } display_name: "${version} ${topology} ${api-version} " tags: ["tests-variant"] tasks: - name: "test" - matrix_name: "tests-load-balancer-secure" - matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk17"], version: ["5.0", "6.0", "latest"], topology: "sharded-cluster", os: "ubuntu" } + matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk17"], version: ["5.0", "6.0", "7.0", "latest"], topology: "sharded-cluster", os: "ubuntu" } display_name: "Load Balancer ${version} ${auth} ${ssl} ${jdk} ${os}" tasks: - name: "load-balancer-test" @@ -1947,7 +1954,7 @@ buildvariants: - name: "serverless-test" - matrix_name: "tests-slow" - matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk17", version: ["6.0"], topology: "standalone", os: "linux" } + matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk17", version: ["7.0"], topology: "standalone", os: "linux" } display_name: "Slow: ${version} ${topology} ${ssl} ${jdk} ${os} " tags: ["tests-slow-variant"] tasks: @@ -1961,14 +1968,14 @@ buildvariants: - name: "socket-test" - matrix_name: "tests-netty" - matrix_spec: { auth: "noauth", ssl: "*", jdk: "jdk8", version: ["6.0"], topology: "replicaset", os: "linux" } + matrix_spec: { auth: "noauth", ssl: "*", jdk: "jdk8", version: ["7.0"], topology: "replicaset", os: "linux" } display_name: "Netty: ${version} ${topology} ${ssl} ${auth} ${jdk} ${os} " tags: ["tests-netty-variant"] tasks: - name: "netty-test" - matrix_name: "tests-netty-ssl-provider" - matrix_spec: { netty-ssl-provider: "*", auth: "auth", ssl: "ssl", jdk: "jdk8", version: ["6.0"], topology: "replicaset", os: "linux" } + matrix_spec: { netty-ssl-provider: "*", auth: "auth", ssl: "ssl", jdk: "jdk8", version: ["7.0"], topology: "replicaset", os: "linux" } display_name: "Netty SSL provider: ${version} ${topology} ${ssl} SslProvider.${netty-ssl-provider} ${auth} ${jdk} ${os} " tags: ["tests-netty-variant"] tasks: @@ -2010,7 +2017,7 @@ buildvariants: - name: "plain-auth-test" - matrix_name: "aws-auth-test" - matrix_spec: { ssl: "nossl", jdk: ["jdk8", "jdk17"], version: ["4.4", "5.0", "6.0", "latest"], os: "ubuntu", + matrix_spec: { ssl: "nossl", jdk: ["jdk8", "jdk17"], version: ["4.4", "5.0", "6.0", "7.0", "latest"], os: "ubuntu", aws-credential-provider: "*" } display_name: "MONGODB-AWS Auth test ${version} ${jdk} ${aws-credential-provider}" run_on: ubuntu2004-small @@ -2023,21 +2030,21 @@ buildvariants: - name: "aws-auth-test-with-web-identity-credentials" #- matrix_name: "aws-ecs-auth-test" -# matrix_spec: { ssl: "nossl", jdk: ["jdk8", "jdk17"], version: ["4.4", "5.0", "6.0", "latest"], os: "ubuntu" } +# matrix_spec: { ssl: "nossl", jdk: ["jdk8", "jdk17"], version: ["4.4", "5.0", "6.0", "7.0", "latest"], os: "ubuntu" } # display_name: "MONGODB-AWS ECS Auth test ${version} ${jdk}" # run_on: ubuntu2004-small # tasks: # - name: "aws-ECS-auth-test" - matrix_name: "accept-api-version-2-test" - matrix_spec: { ssl: "nossl", auth: "noauth", jdk: "jdk17", version: ["5.0", "6.0", "latest"], topology: "standalone", os: "linux" } + matrix_spec: { ssl: "nossl", auth: "noauth", jdk: "jdk17", version: ["5.0", "6.0", "7.0", "latest"], topology: "standalone", os: "linux" } display_name: "Accept API Version 2 ${version}" run_on: ubuntu2004-small tasks: - name: "accept-api-version-2-test" - matrix_name: "ocsp-test" - matrix_spec: { auth: "noauth", ssl: "ssl", jdk: "jdk17", version: ["4.4", "5.0", "6.0", "latest"], os: "ubuntu" } + matrix_spec: { auth: "noauth", ssl: "ssl", jdk: "jdk17", version: ["4.4", "5.0", "6.0", "7.0", "latest"], os: "ubuntu" } display_name: "OCSP test ${version} ${os}" tasks: - name: ".ocsp" @@ -2067,14 +2074,14 @@ buildvariants: - name: "reactive-streams-tck-test" - matrix_name: "scala-tests" - matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk17", version: ["6.0"], topology: "replicaset", scala: "*", os: "ubuntu" } + matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk17", version: ["7.0"], topology: "replicaset", scala: "*", os: "ubuntu" } display_name: "${scala} ${version} ${topology} ${os}" tags: ["test-scala-variant"] tasks: - name: "scala-tests" - matrix_name: "kotlin-tests" - matrix_spec: { auth: "noauth", ssl: "nossl", jdk: ["jdk8", "jdk17"], version: ["6.0"], topology: "replicaset", os: "ubuntu" } + matrix_spec: { auth: "noauth", ssl: "nossl", jdk: ["jdk8", "jdk17"], version: ["7.0"], topology: "replicaset", os: "ubuntu" } display_name: "Kotlin: ${jdk} ${version} ${topology} ${os}" tags: ["test-kotlin-variant"] tasks: @@ -2111,7 +2118,7 @@ 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", "latest" ], topology: ["replicaset"] } + matrix_spec: { os: "linux", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", "latest" ], topology: ["replicaset"] } display_name: "CSFLE with mongocryptd: ${version}" tasks: - name: "csfle-tests-with-mongocryptd"