@@ -94,7 +94,7 @@ functions:
94
94
export FLE_AZURE_CLIENT_ID=${FLE_AZURE_CLIENT_ID}
95
95
export FLE_AZURE_CLIENT_SECRET=${FLE_AZURE_CLIENT_SECRET}
96
96
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}
98
98
set -o xtrace # Enable tracing.
99
99
EOT
100
100
# Do not output expansion.yml contents after this point
@@ -584,7 +584,7 @@ functions:
584
584
if [ "${skip_web_identity_auth_test}" = "true" ]; then
585
585
echo "This platform does not support the web identity auth test, skipping..."
586
586
exit 0
587
- fi
587
+ fi
588
588
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
589
589
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
590
590
export AWS_ROLE_ARN="${iam_auth_assume_web_role_name}"
@@ -611,7 +611,7 @@ functions:
611
611
if [ "${skip_EC2_auth_test}" = "true" ]; then
612
612
echo "This platform does not support the web identity auth test, skipping..."
613
613
exit 0
614
- fi
614
+ fi
615
615
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
616
616
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
617
617
export AWS_ROLE_ARN="${iam_auth_assume_web_role_name}"
@@ -1678,6 +1678,10 @@ axes:
1678
1678
display_name : " rapid"
1679
1679
variables :
1680
1680
VERSION : " rapid"
1681
+ - id : " 7.0"
1682
+ display_name : " 7.0"
1683
+ variables :
1684
+ VERSION : " 7.0"
1681
1685
- id : " 6.0"
1682
1686
display_name : " 6.0"
1683
1687
variables :
@@ -1926,7 +1930,7 @@ buildvariants:
1926
1930
- name : test-netstandard21
1927
1931
1928
1932
- 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"] }
1930
1934
display_name : " ${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
1931
1935
tags : ["tests-variant"]
1932
1936
tasks :
@@ -1950,15 +1954,15 @@ buildvariants:
1950
1954
- name : test-netstandard21
1951
1955
1952
1956
- 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"] }
1954
1958
display_name : " ${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
1955
1959
tags : ["tests-variant"]
1956
1960
tasks :
1957
1961
- name : test-netstandard21
1958
1962
1959
1963
# ubuntu 18 does not support SSL until 4.0
1960
1964
- 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" }
1962
1966
display_name : " ${version} ${topology} ${auth} ${ssl} ${os}"
1963
1967
tags : ["tests-variant"]
1964
1968
tasks :
@@ -1974,14 +1978,14 @@ buildvariants:
1974
1978
- name : test-netstandard21
1975
1979
1976
1980
- 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"] }
1978
1982
display_name : " ${version} ${topology} ${auth} ${ssl} ${os}"
1979
1983
tags : ["tests-variant"]
1980
1984
tasks :
1981
1985
- name : test-netstandard21
1982
1986
1983
1987
- 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"] }
1985
1989
display_name : " ${version} ${topology} ${auth} ${ssl} ${os}"
1986
1990
tags : ["tests-variant"]
1987
1991
tasks :
@@ -1996,38 +2000,38 @@ buildvariants:
1996
2000
- name : test-netstandard21
1997
2001
1998
2002
- 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" }
2000
2004
display_name : " OCSP ${version} ${os}"
2001
2005
batchtime : 20160 # 14 days
2002
2006
tasks :
2003
2007
- name : " .ocsp"
2004
2008
2005
2009
- 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" }
2007
2011
display_name : " MONGODB-AWS Auth test ${version} ${os}"
2008
2012
run_on :
2009
2013
- windows-64-vs2017-test
2010
2014
tasks :
2011
2015
- name : aws-auth-tests
2012
2016
2013
2017
- 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" }
2015
2019
display_name : " MONGODB-AWS Auth test ${version} ${os}"
2016
2020
run_on :
2017
2021
- ubuntu1804-test
2018
2022
tasks :
2019
2023
- name : aws-auth-tests
2020
2024
2021
2025
- 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" }
2023
2027
display_name : " MONGODB-AWS Auth test ${version} ${os}"
2024
2028
run_on :
2025
2029
- macos-1100
2026
2030
tasks :
2027
2031
- name : aws-auth-tests
2028
2032
2029
2033
- 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" }
2031
2035
display_name : " Stable API ${version} ${topology} ${auth} ${ssl} ${os}"
2032
2036
run_on :
2033
2037
- windows-64-vs2017-test
@@ -2043,14 +2047,14 @@ buildvariants:
2043
2047
- name : plain-auth-tests
2044
2048
2045
2049
- 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" }
2047
2051
display_name : " Load Balancer ${version} ${auth} ${ssl} ${os}"
2048
2052
tasks :
2049
2053
- name : " test-load-balancer-netstandard20"
2050
2054
- name : " test-load-balancer-netstandard21"
2051
2055
2052
2056
- 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" }
2054
2058
display_name : " Load Balancer ${version} ${auth} ${ssl} ${os}"
2055
2059
tasks :
2056
2060
- name : " test-load-balancer-netstandard20"
@@ -2110,7 +2114,7 @@ buildvariants:
2110
2114
- name : test-gssapi-netstandard21
2111
2115
2112
2116
- 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"] }
2114
2118
display_name : " CSFLE Mocked KMS ${version} ${os}"
2115
2119
tasks :
2116
2120
- name : test-csfle-with-mocked-kms-tls-net472
@@ -2121,7 +2125,7 @@ buildvariants:
2121
2125
- name : test-csfle-with-mongocryptd-netstandard21
2122
2126
2123
2127
- 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"] }
2125
2129
display_name : " CSFLE Mocked KMS ${version} ${os}"
2126
2130
tasks :
2127
2131
- name : test-csfle-with-mocked-kms-tls-netstandard20
@@ -2130,7 +2134,7 @@ buildvariants:
2130
2134
- name : test-csfle-with-mongocryptd-netstandard21
2131
2135
2132
2136
- 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"] }
2134
2138
display_name : " CSFLE Mocked KMS ${version} ${os}"
2135
2139
tasks :
2136
2140
- name : test-csfle-with-mocked-kms-tls-netstandard21
@@ -2153,7 +2157,7 @@ buildvariants:
2153
2157
- name : test-csfle-with-mongocryptd-netstandard21
2154
2158
2155
2159
- 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"] }
2157
2161
display_name : " smoke-tests ${version} ${os}"
2158
2162
batchtime : 1440 # 1 day
2159
2163
tasks :
@@ -2164,7 +2168,7 @@ buildvariants:
2164
2168
- name : test-smoke-tests-net60
2165
2169
2166
2170
- 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"] }
2168
2172
display_name : " smoke-tests ${version} ${os}"
2169
2173
batchtime : 1440 # 1 day
2170
2174
tasks :
@@ -2174,7 +2178,7 @@ buildvariants:
2174
2178
- name : test-smoke-tests-net60
2175
2179
2176
2180
- 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"] }
2178
2182
display_name : " smoke-tests ${version} ${os}"
2179
2183
batchtime : 1440 # 1 day
2180
2184
tasks :
0 commit comments