@@ -94,7 +94,7 @@ functions:
9494 export FLE_AZURE_CLIENT_ID=${FLE_AZURE_CLIENT_ID}
9595 export FLE_AZURE_CLIENT_SECRET=${FLE_AZURE_CLIENT_SECRET}
9696 export FLE_GCP_EMAIL=${FLE_GCP_EMAIL}
97- export FLE_GCP_PRIVATE_KEY=${FLE_GCP_PRIVATE_KEY}
97+ export FLE_GCP_PRIVATE_KEY=${FLE_GCP_PRIVATE_KEY}
9898 set -o xtrace # Enable tracing.
9999 EOT
100100 # Do not output expansion.yml contents after this point
@@ -584,7 +584,7 @@ functions:
584584 if [ "${skip_web_identity_auth_test}" = "true" ]; then
585585 echo "This platform does not support the web identity auth test, skipping..."
586586 exit 0
587- fi
587+ fi
588588 # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
589589 cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
590590 export AWS_ROLE_ARN="${iam_auth_assume_web_role_name}"
@@ -611,7 +611,7 @@ functions:
611611 if [ "${skip_EC2_auth_test}" = "true" ]; then
612612 echo "This platform does not support the web identity auth test, skipping..."
613613 exit 0
614- fi
614+ fi
615615 # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
616616 cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
617617 export AWS_ROLE_ARN="${iam_auth_assume_web_role_name}"
@@ -1678,6 +1678,10 @@ axes:
16781678 display_name : " rapid"
16791679 variables :
16801680 VERSION : " rapid"
1681+ - id : " 7.0"
1682+ display_name : " 7.0"
1683+ variables :
1684+ VERSION : " 7.0"
16811685 - id : " 6.0"
16821686 display_name : " 6.0"
16831687 variables :
@@ -1926,7 +1930,7 @@ buildvariants:
19261930 - name : test-netstandard21
19271931
19281932- matrix_name : " tests-snappy-compression-macOS"
1929- matrix_spec : { compressor : "snappy", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
1933+ 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"] }
19301934 display_name : " ${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
19311935 tags : ["tests-variant"]
19321936 tasks :
@@ -1950,15 +1954,15 @@ buildvariants:
19501954 - name : test-netstandard21
19511955
19521956- matrix_name : " tests-zstandard-compression-macOS"
1953- matrix_spec : { compressor : "zstandard", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
1957+ 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"] }
19541958 display_name : " ${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
19551959 tags : ["tests-variant"]
19561960 tasks :
19571961 - name : test-netstandard21
19581962
19591963 # ubuntu 18 does not support SSL until 4.0
19601964- matrix_name : " secure-tests-linux"
1961- matrix_spec : { version: ["4.0", "4.2", "4.4", "5.0", "6.0", "rapid", "latest"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-1804" }
1965+ 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" }
19621966 display_name : " ${version} ${topology} ${auth} ${ssl} ${os}"
19631967 tags : ["tests-variant"]
19641968 tasks :
@@ -1974,14 +1978,14 @@ buildvariants:
19741978 - name : test-netstandard21
19751979
19761980- matrix_name : " secure-tests-macOS"
1977- matrix_spec : { version: ["5.0", "6.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-1100", "macos-1100-arm64"] }
1981+ matrix_spec : { version: ["5.0", "6.0", "7.0", " rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-1100", "macos-1100-arm64"] }
19781982 display_name : " ${version} ${topology} ${auth} ${ssl} ${os}"
19791983 tags : ["tests-variant"]
19801984 tasks :
19811985 - name : test-netstandard21
19821986
19831987- matrix_name : " unsecure-tests-macOS"
1984- matrix_spec : { version: ["5.0", "6.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-1100", "macos-1100-arm64"] }
1988+ matrix_spec : { version: ["5.0", "6.0", "7.0", " rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-1100", "macos-1100-arm64"] }
19851989 display_name : " ${version} ${topology} ${auth} ${ssl} ${os}"
19861990 tags : ["tests-variant"]
19871991 tasks :
@@ -1996,38 +2000,38 @@ buildvariants:
19962000 - name : test-netstandard21
19972001
19982002- matrix_name : " ocsp-tests"
1999- matrix_spec : { version: ["4.4", "5.0", "6.0", "rapid", "latest"], auth: "noauth", ssl: "ssl", topology: "standalone", os: "windows-64" }
2003+ matrix_spec : { version: ["4.4", "5.0", "6.0", "7.0", " rapid", "latest"], auth: "noauth", ssl: "ssl", topology: "standalone", os: "windows-64" }
20002004 display_name : " OCSP ${version} ${os}"
20012005 batchtime : 20160 # 14 days
20022006 tasks :
20032007 - name : " .ocsp"
20042008
20052009- matrix_name : aws-auth-tests-windows
2006- matrix_spec : { version: ["4.4", "5.0", "6.0", "rapid", "latest"], topology: "standalone", os: "windows-64" }
2010+ matrix_spec : { version: ["4.4", "5.0", "6.0", "7.0", " rapid", "latest"], topology: "standalone", os: "windows-64" }
20072011 display_name : " MONGODB-AWS Auth test ${version} ${os}"
20082012 run_on :
20092013 - windows-64-vs2017-test
20102014 tasks :
20112015 - name : aws-auth-tests
20122016
20132017- matrix_name : aws-auth-tests-linux
2014- matrix_spec : { version: ["6.0", "rapid", "latest"], topology: "standalone", os: "ubuntu-1804" }
2018+ matrix_spec : { version: ["6.0", "7.0", " rapid", "latest"], topology: "standalone", os: "ubuntu-1804" }
20152019 display_name : " MONGODB-AWS Auth test ${version} ${os}"
20162020 run_on :
20172021 - ubuntu1804-test
20182022 tasks :
20192023 - name : aws-auth-tests
20202024
20212025- matrix_name : aws-auth-tests-macos
2022- matrix_spec : { version: ["6.0", "rapid", "latest"], topology: "standalone", os: "macos-1100" }
2026+ matrix_spec : { version: ["6.0", "7.0", " rapid", "latest"], topology: "standalone", os: "macos-1100" }
20232027 display_name : " MONGODB-AWS Auth test ${version} ${os}"
20242028 run_on :
20252029 - macos-1100
20262030 tasks :
20272031 - name : aws-auth-tests
20282032
20292033- matrix_name : stable-api-tests
2030- matrix_spec : { version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", auth: "auth", ssl: "nossl", os: "windows-64" }
2034+ matrix_spec : { version: ["5.0", "6.0", "7.0", " rapid", "latest"], topology: "standalone", auth: "auth", ssl: "nossl", os: "windows-64" }
20312035 display_name : " Stable API ${version} ${topology} ${auth} ${ssl} ${os}"
20322036 run_on :
20332037 - windows-64-vs2017-test
@@ -2043,14 +2047,14 @@ buildvariants:
20432047 - name : plain-auth-tests
20442048
20452049- matrix_name : load-balancer-tests
2046- matrix_spec : { version: ["5.0", "6.0", "rapid", "latest"], auth: "noauth", ssl: "nossl", topology: "sharded-cluster", os: "ubuntu-1804" }
2050+ matrix_spec : { version: ["5.0", "6.0", "7.0", " rapid", "latest"], auth: "noauth", ssl: "nossl", topology: "sharded-cluster", os: "ubuntu-1804" }
20472051 display_name : " Load Balancer ${version} ${auth} ${ssl} ${os}"
20482052 tasks :
20492053 - name : " test-load-balancer-netstandard20"
20502054 - name : " test-load-balancer-netstandard21"
20512055
20522056- matrix_name : load-balancer-tests-secure
2053- matrix_spec : { version: ["5.0", "6.0", "rapid", "latest"], auth: "auth", ssl: "ssl", topology: "sharded-cluster", os: "ubuntu-1804" }
2057+ matrix_spec : { version: ["5.0", "6.0", "7.0", " rapid", "latest"], auth: "auth", ssl: "ssl", topology: "sharded-cluster", os: "ubuntu-1804" }
20542058 display_name : " Load Balancer ${version} ${auth} ${ssl} ${os}"
20552059 tasks :
20562060 - name : " test-load-balancer-netstandard20"
@@ -2110,7 +2114,7 @@ buildvariants:
21102114 - name : test-gssapi-netstandard21
21112115
21122116- matrix_name : " csfle-with-mocked-kms-tests-windows"
2113- matrix_spec : { os: "windows-64", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] }
2117+ matrix_spec : { os: "windows-64", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", " rapid", "latest" ], topology: ["replicaset"] }
21142118 display_name : " CSFLE Mocked KMS ${version} ${os}"
21152119 tasks :
21162120 - name : test-csfle-with-mocked-kms-tls-net472
@@ -2121,7 +2125,7 @@ buildvariants:
21212125 - name : test-csfle-with-mongocryptd-netstandard21
21222126
21232127- matrix_name : " csfle-with-mocked-kms-tests-linux"
2124- matrix_spec : { os: "ubuntu-1804", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] }
2128+ matrix_spec : { os: "ubuntu-1804", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "7.0", " rapid", "latest" ], topology: ["replicaset"] }
21252129 display_name : " CSFLE Mocked KMS ${version} ${os}"
21262130 tasks :
21272131 - name : test-csfle-with-mocked-kms-tls-netstandard20
@@ -2130,7 +2134,7 @@ buildvariants:
21302134 - name : test-csfle-with-mongocryptd-netstandard21
21312135
21322136- matrix_name : " csfle-with-mocked-kms-tests-macOS"
2133- matrix_spec : { os: [ "macos-1100", "macos-1100-arm64" ], ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] }
2137+ 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"] }
21342138 display_name : " CSFLE Mocked KMS ${version} ${os}"
21352139 tasks :
21362140 - name : test-csfle-with-mocked-kms-tls-netstandard21
@@ -2153,7 +2157,7 @@ buildvariants:
21532157 - name : test-csfle-with-mongocryptd-netstandard21
21542158
21552159- matrix_name : " smoke-tests-windows"
2156- matrix_spec : { os: "windows-64", ssl: "nossl", version: [ "5.0", "6.0", "latest" ], topology: ["replicaset"] }
2160+ matrix_spec : { os: "windows-64", ssl: "nossl", version: [ "5.0", "6.0", "7.0", " latest" ], topology: ["replicaset"] }
21572161 display_name : " smoke-tests ${version} ${os}"
21582162 batchtime : 1440 # 1 day
21592163 tasks :
@@ -2164,7 +2168,7 @@ buildvariants:
21642168 - name : test-smoke-tests-net60
21652169
21662170- matrix_name : " smoke-tests-linux"
2167- matrix_spec : { os: "ubuntu-1804", ssl: "nossl", version: [ "5.0", "6.0", "latest" ], topology: ["replicaset"] }
2171+ matrix_spec : { os: "ubuntu-1804", ssl: "nossl", version: [ "5.0", "6.0", "7.0", " latest" ], topology: ["replicaset"] }
21682172 display_name : " smoke-tests ${version} ${os}"
21692173 batchtime : 1440 # 1 day
21702174 tasks :
@@ -2174,7 +2178,7 @@ buildvariants:
21742178 - name : test-smoke-tests-net60
21752179
21762180- matrix_name : " smoke-tests-macOS"
2177- matrix_spec : { os: "macos-1100", ssl: "nossl", version: [ "5.0", "6.0", "latest" ], topology: ["replicaset"] }
2181+ matrix_spec : { os: "macos-1100", ssl: "nossl", version: [ "5.0", "6.0", "7.0", " latest" ], topology: ["replicaset"] }
21782182 display_name : " smoke-tests ${version} ${os}"
21792183 batchtime : 1440 # 1 day
21802184 tasks :
0 commit comments