@@ -1372,7 +1372,7 @@ tasks:
13721372
13731373 - name : " release-combine"
13741374 tags : ["release_tag"]
1375- run_on : ubuntu2004 -small
1375+ run_on : rhel84 -small
13761376 depends_on :
13771377 - name : " *"
13781378 variant : " .release_tag"
@@ -2218,7 +2218,8 @@ tasks:
22182218 shell : " bash"
22192219 script : |
22202220 ${PREPARE_SHELL}
2221- export LIBMONGOCRYPT_URL=https://s3.amazonaws.com/mciuploads/libmongocrypt/ubuntu2004-64/master/latest/libmongocrypt.tar.gz
2221+ export PYTHON_BINARY=/opt/mongodbtoolchain/v4/bin/python3
2222+ export LIBMONGOCRYPT_URL=https://s3.amazonaws.com/mciuploads/libmongocrypt/debian10/master/latest/libmongocrypt.tar.gz
22222223 SUCCESS=false TEST_FLE_GCP_AUTO=1 ./.evergreen/run-tests.sh
22232224
22242225 - name : testazurekms-task
@@ -2272,10 +2273,10 @@ tasks:
22722273 set -o errexit
22732274 ${PREPARE_SHELL}
22742275 cd src
2275- PYTHON_BINARY=
2276+ PYTHON_BINARY=/opt/mongodbtoolchain/v4/bin/python3 \
22762277 KEY_NAME='${testazurekms_keyname}' \
22772278 KEY_VAULT_ENDPOINT='${testazurekms_keyvaultendpoint}' \
2278- LIBMONGOCRYPT_URL=https://s3.amazonaws.com/mciuploads/libmongocrypt/ubuntu2004-64 /master/latest/libmongocrypt.tar.gz \
2279+ LIBMONGOCRYPT_URL=https://s3.amazonaws.com/mciuploads/libmongocrypt/debian10 /master/latest/libmongocrypt.tar.gz \
22792280 SUCCESS=false TEST_FLE_AZURE_AUTO=1 \
22802281 ./.evergreen/run-tests.sh
22812282
@@ -2322,17 +2323,19 @@ axes:
23222323 skip_web_identity_auth_test : true
23232324 python3_binary : /Library/Frameworks/Python.framework/Versions/3.8/bin/python3
23242325 libmongocrypt_url : https://s3.amazonaws.com/mciuploads/libmongocrypt/macos/master/latest/libmongocrypt.tar.gz
2325- - id : rhel76
2326- display_name : " RHEL 7.6 "
2326+ - id : rhel7
2327+ display_name : " RHEL 7.x "
23272328 run_on : rhel76-small
23282329 batchtime : 10080 # 7 days
23292330 variables :
2331+ python3_binary : " /opt/python/3.8/bin/python3"
23302332 libmongocrypt_url : https://s3.amazonaws.com/mciuploads/libmongocrypt/rhel-70-64-bit/master/latest/libmongocrypt.tar.gz
2331- - id : rhel84
2332- display_name : " RHEL 8.4 "
2333+ - id : rhel8
2334+ display_name : " RHEL 8.x "
23332335 run_on : rhel84-small
23342336 batchtime : 10080 # 7 days
23352337 variables :
2338+ python3_binary : " /opt/python/3.8/bin/python3"
23362339 libmongocrypt_url : https://s3.amazonaws.com/mciuploads/libmongocrypt/rhel-80-64-bit/master/latest/libmongocrypt.tar.gz
23372340 - id : rhel80-fips
23382341 display_name : " RHEL 8.0 FIPS"
@@ -2815,9 +2818,9 @@ buildvariants:
28152818 tasks :
28162819 - " .6.0"
28172820
2818- - matrix_name : " tests-python-version-rhel8.4 -test-ssl"
2821+ - matrix_name : " tests-python-version-rhel8-test-ssl"
28192822 matrix_spec :
2820- platform : rhel84
2823+ platform : rhel8
28212824 python-version : " *"
28222825 auth-ssl : " *"
28232826 coverage : " *"
@@ -2835,14 +2838,14 @@ buildvariants:
28352838
28362839- matrix_name : " tests-pyopenssl"
28372840 matrix_spec :
2838- platform : rhel84
2841+ platform : rhel8
28392842 python-version : " *"
28402843 auth : " *"
28412844 ssl : " ssl"
28422845 pyopenssl : " *"
28432846 # Only test "noauth" with Python 3.7.
28442847 exclude_spec :
2845- platform : rhel84
2848+ platform : rhel8
28462849 python-version : ["3.8", "3.9", "3.10", "pypy3.7", "pypy3.8"]
28472850 auth : " noauth"
28482851 ssl : " ssl"
@@ -2874,9 +2877,9 @@ buildvariants:
28742877 tasks :
28752878 - ' .replica_set'
28762879
2877- - matrix_name : " tests-python-version-rhel84 -test-encryption"
2880+ - matrix_name : " tests-python-version-rhel8 -test-encryption"
28782881 matrix_spec :
2879- platform : rhel84
2882+ platform : rhel8
28802883 python-version : " *"
28812884 auth-ssl : noauth-nossl
28822885# TODO: dependency error for 'coverage-report' task:
@@ -2888,38 +2891,38 @@ buildvariants:
28882891 rules :
28892892 - if :
28902893 encryption : ["encryption", "encryption_crypt_shared"]
2891- platform : rhel84
2894+ platform : rhel8
28922895 auth-ssl : noauth-nossl
28932896 python-version : " *"
28942897 then :
28952898 add_tasks : *encryption-server-versions
28962899
2897- - matrix_name : " tests-python-version-rhel84 -without-c-extensions"
2900+ - matrix_name : " tests-python-version-rhel8 -without-c-extensions"
28982901 matrix_spec :
2899- platform : rhel84
2902+ platform : rhel8
29002903 python-version : " *"
29012904 c-extensions : without-c-extensions
29022905 auth-ssl : noauth-nossl
29032906 coverage : " *"
29042907 exclude_spec :
29052908 # These interpreters are always tested without extensions.
2906- - platform : rhel84
2909+ - platform : rhel8
29072910 python-version : ["pypy3.7", "pypy3.8"]
29082911 c-extensions : " *"
29092912 auth-ssl : " *"
29102913 coverage : " *"
29112914 display_name : " ${c-extensions} ${python-version} ${platform} ${auth} ${ssl} ${coverage}"
29122915 tasks : *all-server-versions
29132916
2914- - matrix_name : " tests-python-version-rhel84 -compression"
2917+ - matrix_name : " tests-python-version-rhel8 -compression"
29152918 matrix_spec :
2916- platform : rhel84
2919+ platform : rhel8
29172920 python-version : " *"
29182921 c-extensions : " *"
29192922 compression : " *"
29202923 exclude_spec :
29212924 # These interpreters are always tested without extensions.
2922- - platform : rhel84
2925+ - platform : rhel8
29232926 python-version : ["pypy3.7", "pypy3.8"]
29242927 c-extensions : " with-c-extensions"
29252928 compression : " *"
@@ -2940,36 +2943,21 @@ buildvariants:
29402943 - " test-4.0-standalone"
29412944 - " test-3.6-standalone"
29422945
2943- - matrix_name : " tests-python-version-green-framework-rhel84 "
2946+ - matrix_name : " tests-python-version-green-framework-rhel8 "
29442947 matrix_spec :
2945- platform : rhel84
2948+ platform : rhel8
29462949 python-version : " *"
29472950 green-framework : " *"
29482951 auth-ssl : " *"
29492952 exclude_spec :
29502953 # Don't test green frameworks on these Python versions.
2951- - platform : rhel84
2952- python-version : ["pypy3.7", "pypy3.8", "3.11" ]
2954+ - platform : rhel8
2955+ python-version : ["pypy3.7", "pypy3.8"]
29532956 green-framework : " *"
29542957 auth-ssl : " *"
29552958 display_name : " ${green-framework} ${python-version} ${platform} ${auth-ssl}"
29562959 tasks : *all-server-versions
29572960
2958- - matrix_name : " tests-python-version-green-framework-ubuntu20"
2959- matrix_spec :
2960- platform : ubuntu-20.04
2961- python-version : ["3.11"]
2962- green-framework : " *"
2963- auth-ssl : " *"
2964- display_name : " ${green-framework} ${python-version} ${platform} ${auth-ssl}"
2965- tasks :
2966- - " .rapid"
2967- - " .latest"
2968- - " .7.0"
2969- - " .6.0"
2970- - " .5.0"
2971- - " .4.4"
2972-
29732961- matrix_name : " tests-windows-python-version"
29742962 matrix_spec :
29752963 platform : windows-64-vsMulti-small
@@ -2988,7 +2976,7 @@ buildvariants:
29882976
29892977- matrix_name : " tests-python-version-supports-openssl-102-test-ssl"
29902978 matrix_spec :
2991- platform : rhel76
2979+ platform : rhel7
29922980 # Python 3.10+ requires OpenSSL 1.1.1+
29932981 python-version : ["3.7", "3.8", "3.9", "pypy3.7", "pypy3.8"]
29942982 auth-ssl : " *"
@@ -3016,13 +3004,13 @@ buildvariants:
30163004# Storage engine tests on RHEL 8.4 (x86_64) with Python 3.7.
30173005- matrix_name : " tests-storage-engines"
30183006 matrix_spec :
3019- platform : rhel84
3007+ platform : rhel8
30203008 storage-engine : " *"
30213009 python-version : 3.7
30223010 display_name : " Storage ${storage-engine} ${python-version} ${platform}"
30233011 rules :
30243012 - if :
3025- platform : rhel84
3013+ platform : rhel8
30263014 storage-engine : ["inmemory"]
30273015 python-version : " *"
30283016 then :
@@ -3037,7 +3025,7 @@ buildvariants:
30373025 - " test-3.6-standalone"
30383026 - if :
30393027 # MongoDB 4.2 drops support for MMAPv1
3040- platform : rhel84
3028+ platform : rhel8
30413029 storage-engine : ["mmapv1"]
30423030 python-version : " *"
30433031 then :
@@ -3050,7 +3038,7 @@ buildvariants:
30503038# enableTestCommands=0 tests on RHEL 8.4 (x86_64) with Python 3.7.
30513039- matrix_name : " test-disableTestCommands"
30523040 matrix_spec :
3053- platform : rhel84
3041+ platform : rhel8
30543042 disableTestCommands : " *"
30553043 python-version : " 3.7"
30563044 display_name : " Disable test commands ${python-version} ${platform}"
@@ -3059,7 +3047,7 @@ buildvariants:
30593047
30603048- matrix_name : " test-linux-enterprise-auth"
30613049 matrix_spec :
3062- platform : rhel84
3050+ platform : rhel8
30633051 python-version : " *"
30643052 auth : " auth"
30653053 display_name : " Enterprise ${auth} ${platform} ${python-version}"
@@ -3092,15 +3080,15 @@ buildvariants:
30923080
30933081- matrix_name : " mockupdb-tests"
30943082 matrix_spec :
3095- platform : rhel84
3083+ platform : rhel8
30963084 python-version : 3.7
30973085 display_name : " MockupDB Tests"
30983086 tasks :
30993087 - name : " mockupdb"
31003088
31013089- matrix_name : " tests-doctests"
31023090 matrix_spec :
3103- platform : rhel84
3091+ platform : rhel8
31043092 python-version : ["3.8"]
31053093 display_name : " Doctests ${python-version} ${platform}"
31063094 tasks :
@@ -3126,15 +3114,15 @@ buildvariants:
31263114
31273115- matrix_name : " atlas-connect"
31283116 matrix_spec :
3129- platform : rhel84
3117+ platform : rhel8
31303118 python-version : " *"
31313119 display_name : " Atlas connect ${python-version} ${platform}"
31323120 tasks :
31333121 - name : " atlas-connect"
31343122
31353123- matrix_name : " serverless"
31363124 matrix_spec :
3137- platform : rhel84
3125+ platform : rhel8
31383126 python-version : " *"
31393127 auth-ssl : auth-ssl
31403128 serverless : " *"
@@ -3144,7 +3132,7 @@ buildvariants:
31443132
31453133- matrix_name : " data-lake-spec-tests"
31463134 matrix_spec :
3147- platform : rhel84
3135+ platform : rhel8
31483136 python-version : ["3.7", "3.10"]
31493137 auth : " auth"
31503138 c-extensions : " *"
@@ -3154,7 +3142,7 @@ buildvariants:
31543142
31553143- matrix_name : " stable-api-tests"
31563144 matrix_spec :
3157- platform : rhel84
3145+ platform : rhel8
31583146 python-version : ["3.7", "3.10"]
31593147 auth : " auth"
31603148 versionedApi : " *"
@@ -3167,7 +3155,7 @@ buildvariants:
31673155
31683156- matrix_name : " ocsp-test"
31693157 matrix_spec :
3170- platform : ubuntu-20.04
3158+ platform : rhel8
31713159 python-version : ["3.7", "3.10", "pypy3.7", "pypy3.8"]
31723160 mongodb-version : ["4.4", "5.0", "6.0", "7.0", "latest"]
31733161 auth : " noauth"
@@ -3204,7 +3192,7 @@ buildvariants:
32043192
32053193- matrix_name : " oidc-auth-test"
32063194 matrix_spec :
3207- platform : [ rhel84 ]
3195+ platform : [ rhel8 ]
32083196 python-version : ["3.9"]
32093197 display_name : " MONGODB-OIDC Auth ${platform} ${python-version}"
32103198 tasks :
@@ -3251,7 +3239,7 @@ buildvariants:
32513239
32523240- matrix_name : " load-balancer"
32533241 matrix_spec :
3254- platform : rhel84
3242+ platform : rhel8
32553243 mongodb-version : ["6.0", "7.0", "rapid", "latest"]
32563244 auth-ssl : " *"
32573245 python-version : " *"
@@ -3263,15 +3251,15 @@ buildvariants:
32633251- name : testgcpkms-variant
32643252 display_name : " GCP KMS"
32653253 run_on :
3266- - ubuntu2004 -small
3254+ - debian10 -small
32673255 tasks :
32683256 - name : testgcpkms_task_group
32693257 batchtime : 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
32703258 - testgcpkms-fail-task
32713259
32723260- name : testazurekms-variant
32733261 display_name : " Azure KMS"
3274- run_on : ubuntu2004 -small
3262+ run_on : debian10 -small
32753263 tasks :
32763264 - name : testazurekms_task_group
32773265 batchtime : 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
@@ -3286,10 +3274,6 @@ buildvariants:
32863274
32873275 # Platform notes
32883276 # i386 builds of OpenSSL or Cyrus SASL are not available
3289- # Ubuntu16.04 ppc64le is only supported by MongoDB 3.4+
3290- # Ubuntu16.04 aarch64 is only supported by MongoDB 3.4+
3291- # Ubuntu16.04 s390x is only supported by MongoDB 3.4+
3292- # Ubuntu16.04 (x86) only supports MongoDB 3.2+
32933277 # Debian 8.1 only supports MongoDB 3.4+
32943278 # SUSE12 s390x is only supported by MongoDB 3.4+
32953279 # No enterprise build for Archlinux, SSL not available
0 commit comments