From c812efe1e4e735d531f24a20fde3f2f22ef89f97 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 23 Mar 2025 10:57:48 -0500 Subject: [PATCH 1/9] test amazon2 --- .evergreen/scripts/generate_config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 0a2496c66d..970a9b5ba3 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -70,7 +70,9 @@ class Host: HOSTS["ubuntu22"] = Host("ubuntu22", "ubuntu2204-small", "Ubuntu-22", dict()) HOSTS["rhel7"] = Host("rhel7", "rhel79-small", "RHEL7", dict()) HOSTS["perf"] = Host("perf", "rhel90-dbx-perf-large", "", dict()) +HOSTS["amazon2"] = Host("amazon2", "amazon2-arm64-latest-large-m8g", dict()) DEFAULT_HOST = HOSTS["rhel8"] +DEFAULT_HOST = HOSTS["amazon2"] # Other hosts OTHER_HOSTS = ["RHEL9-FIPS", "RHEL8-zseries", "RHEL8-POWER8", "RHEL8-arm64"] From c26cc66415f9e5d549aafb1ec3aba07e19e409f7 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 23 Mar 2025 10:59:46 -0500 Subject: [PATCH 2/9] test amazon2 --- .evergreen/generated_configs/variants.yml | 584 +++++++++++----------- .evergreen/scripts/generate_config.py | 4 +- 2 files changed, 295 insertions(+), 293 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index aa20fef895..22f2ff07cf 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -47,22 +47,22 @@ buildvariants: NO_EXT: "1" # Atlas connect tests - - name: atlas-connect-rhel8-python3.9 + - name: atlas-connect-amazon2-python3.9 tasks: - name: .atlas_connect - display_name: Atlas connect RHEL8 Python3.9 + display_name: Atlas connect Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: atlas-connect-rhel8-python3.13 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: atlas-connect-amazon2-python3.13 tasks: - name: .atlas_connect - display_name: Atlas connect RHEL8 Python3.13 + display_name: Atlas connect Amazon2 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Atlas data lake tests - name: atlas-data-lake-ubuntu-22-python3.9 @@ -141,267 +141,267 @@ buildvariants: - rhel87-small # Compression tests - - name: compression-snappy-rhel8-python3.9-no-c + - name: compression-snappy-amazon2-python3.9-no-c tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy RHEL8 Python3.9 No C + display_name: Compression snappy Amazon2 Python3.9 No C run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: snappy NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: compression-snappy-rhel8-python3.10 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: compression-snappy-amazon2-python3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy RHEL8 Python3.10 + display_name: Compression snappy Amazon2 Python3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: snappy - PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: compression-zlib-rhel8-python3.11-no-c + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: compression-zlib-amazon2-python3.11-no-c tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib RHEL8 Python3.11 No C + display_name: Compression zlib Amazon2 Python3.11 No C run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: zlib NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: compression-zlib-rhel8-python3.12 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: compression-zlib-amazon2-python3.12 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib RHEL8 Python3.12 + display_name: Compression zlib Amazon2 Python3.12 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: zlib - PYTHON_BINARY: /opt/python/3.12/bin/python3 - - name: compression-zstd-rhel8-python3.13-no-c + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: compression-zstd-amazon2-python3.13-no-c tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd RHEL8 Python3.13 No C + display_name: Compression zstd Amazon2 Python3.13 No C run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: zstd NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.13/bin/python3 - - name: compression-zstd-rhel8-python3.9 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: compression-zstd-amazon2-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd RHEL8 Python3.9 + display_name: Compression zstd Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: zstd - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: compression-snappy-rhel8-pypy3.10 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: compression-snappy-amazon2-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy RHEL8 PyPy3.10 + display_name: Compression snappy Amazon2 PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: snappy - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 - - name: compression-zlib-rhel8-pypy3.10 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: compression-zlib-amazon2-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib RHEL8 PyPy3.10 + display_name: Compression zlib Amazon2 PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: zlib - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 - - name: compression-zstd-rhel8-pypy3.10 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: compression-zstd-amazon2-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd RHEL8 PyPy3.10 + display_name: Compression zstd Amazon2 PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COMPRESSORS: zstd - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Disable test commands tests - - name: disable-test-commands-rhel8-python3.9 + - name: disable-test-commands-amazon2-python3.9 tasks: - name: .latest .sync_async - display_name: Disable test commands RHEL8 Python3.9 + display_name: Disable test commands Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: AUTH: auth SSL: ssl DISABLE_TEST_COMMANDS: "1" - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Doctests tests - - name: doctests-rhel8-python3.9 + - name: doctests-amazon2-python3.9 tasks: - name: .doctests - display_name: Doctests RHEL8 Python3.9 + display_name: Doctests Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Encryption tests - - name: encryption-rhel8-python3.9 + - name: encryption-amazon2-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption RHEL8 Python3.9 + display_name: Encryption Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-rhel8-python3.13 + - name: encryption-amazon2-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption RHEL8 Python3.13 + display_name: Encryption Amazon2 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-rhel8-pypy3.10 + - name: encryption-amazon2-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption RHEL8 PyPy3.10 + display_name: Encryption Amazon2 PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-rhel8-python3.9 + - name: encryption-crypt_shared-amazon2-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared RHEL8 Python3.9 + display_name: Encryption crypt_shared Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-rhel8-python3.13 + - name: encryption-crypt_shared-amazon2-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared RHEL8 Python3.13 + display_name: Encryption crypt_shared Amazon2 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-rhel8-pypy3.10 + - name: encryption-crypt_shared-amazon2-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared RHEL8 PyPy3.10 + display_name: Encryption crypt_shared Amazon2 PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-rhel8-python3.9 + - name: encryption-pyopenssl-amazon2-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL RHEL8 Python3.9 + display_name: Encryption PyOpenSSL Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-rhel8-python3.13 + - name: encryption-pyopenssl-amazon2-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL RHEL8 Python3.13 + display_name: Encryption PyOpenSSL Amazon2 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-rhel8-pypy3.10 + - name: encryption-pyopenssl-amazon2-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL RHEL8 PyPy3.10 + display_name: Encryption PyOpenSSL Amazon2 PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-rhel8-python3.10 + - name: encryption-amazon2-python3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - display_name: Encryption RHEL8 Python3.10 + display_name: Encryption Amazon2 Python3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: TEST_NAME: encryption - PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: encryption-crypt_shared-rhel8-python3.11 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: encryption-crypt_shared-amazon2-python3.11 tasks: - name: .replica_set .noauth .ssl .sync_async - display_name: Encryption crypt_shared RHEL8 Python3.11 + display_name: Encryption crypt_shared Amazon2 Python3.11 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" - PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: encryption-pyopenssl-rhel8-python3.12 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: encryption-pyopenssl-amazon2-python3.12 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL RHEL8 Python3.12 + display_name: Encryption PyOpenSSL Amazon2 Python3.12 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/python/3.12/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - name: encryption-macos-python3.9 tasks: - name: .latest .replica_set .sync_async @@ -504,30 +504,30 @@ buildvariants: - macos-14 expansions: PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3 - - name: auth-enterprise-rhel8-python3.10 + - name: auth-enterprise-amazon2-python3.10 tasks: - name: .enterprise_auth - display_name: Auth Enterprise RHEL8 Python3.10 + display_name: Auth Enterprise Amazon2 Python3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: auth-enterprise-rhel8-python3.11 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: auth-enterprise-amazon2-python3.11 tasks: - name: .enterprise_auth - display_name: Auth Enterprise RHEL8 Python3.11 + display_name: Auth Enterprise Amazon2 Python3.11 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: auth-enterprise-rhel8-python3.12 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: auth-enterprise-amazon2-python3.12 tasks: - name: .enterprise_auth - display_name: Auth Enterprise RHEL8 Python3.12 + display_name: Auth Enterprise Amazon2 Python3.12 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/3.12/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - name: auth-enterprise-win64-python3.13 tasks: - name: .enterprise_auth @@ -536,14 +536,14 @@ buildvariants: - windows-64-vsMulti-small expansions: PYTHON_BINARY: C:/python/Python313/python.exe - - name: auth-enterprise-rhel8-pypy3.10 + - name: auth-enterprise-amazon2-pypy3.10 tasks: - name: .enterprise_auth - display_name: Auth Enterprise RHEL8 PyPy3.10 + display_name: Auth Enterprise Amazon2 PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Free threaded tests - name: free-threaded-rhel8-python3.13t @@ -572,112 +572,112 @@ buildvariants: PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.13/bin/python3t # Green framework tests - - name: green-eventlet-rhel8-python3.9 + - name: green-eventlet-amazon2-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Eventlet RHEL8 Python3.9 + display_name: Green Eventlet Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: GREEN_FRAMEWORK: eventlet AUTH: auth SSL: ssl - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: green-gevent-rhel8-python3.9 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: green-gevent-amazon2-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Gevent RHEL8 Python3.9 + display_name: Green Gevent Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: GREEN_FRAMEWORK: gevent AUTH: auth SSL: ssl - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: green-eventlet-rhel8-python3.13 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: green-eventlet-amazon2-python3.13 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Eventlet RHEL8 Python3.13 + display_name: Green Eventlet Amazon2 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: GREEN_FRAMEWORK: eventlet AUTH: auth SSL: ssl - PYTHON_BINARY: /opt/python/3.13/bin/python3 - - name: green-gevent-rhel8-python3.13 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: green-gevent-amazon2-python3.13 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Gevent RHEL8 Python3.13 + display_name: Green Gevent Amazon2 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: GREEN_FRAMEWORK: gevent AUTH: auth SSL: ssl - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Load balancer tests - - name: load-balancer-rhel8-v6.0-python3.9 + - name: load-balancer-amazon2-v6.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer RHEL8 v6.0 Python3.9 + display_name: Load Balancer Amazon2 v6.0 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: "6.0" - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: load-balancer-rhel8-v7.0-python3.9 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: load-balancer-amazon2-v7.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer RHEL8 v7.0 Python3.9 + display_name: Load Balancer Amazon2 v7.0 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: "7.0" - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: load-balancer-rhel8-v8.0-python3.9 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: load-balancer-amazon2-v8.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer RHEL8 v8.0 Python3.9 + display_name: Load Balancer Amazon2 v8.0 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: "8.0" - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: load-balancer-rhel8-rapid-python3.9 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: load-balancer-amazon2-rapid-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer RHEL8 rapid Python3.9 + display_name: Load Balancer Amazon2 rapid Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: rapid - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: load-balancer-rhel8-latest-python3.9 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: load-balancer-amazon2-latest-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer RHEL8 latest Python3.9 + display_name: Load Balancer Amazon2 latest Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: latest - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Mockupdb tests - - name: mockupdb-rhel8-python3.9 + - name: mockupdb-amazon2-python3.9 tasks: - name: .mockupdb - display_name: MockupDB RHEL8 Python3.9 + display_name: MockupDB Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Mod wsgi tests - name: mod_wsgi-ubuntu-22-python3.9 @@ -700,51 +700,51 @@ buildvariants: PYTHON_BINARY: /opt/python/3.13/bin/python3 # No c ext tests - - name: no-c-ext-rhel8-python3.9 + - name: no-c-ext-amazon2-python3.9 tasks: - name: .standalone .noauth .nossl !.sync_async - display_name: No C Ext RHEL8 Python3.9 + display_name: No C Ext Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: no-c-ext-rhel8-python3.10 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: no-c-ext-amazon2-python3.10 tasks: - name: .replica_set .noauth .nossl !.sync_async - display_name: No C Ext RHEL8 Python3.10 + display_name: No C Ext Amazon2 Python3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: no-c-ext-rhel8-python3.11 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: no-c-ext-amazon2-python3.11 tasks: - name: .sharded_cluster .noauth .nossl !.sync_async - display_name: No C Ext RHEL8 Python3.11 + display_name: No C Ext Amazon2 Python3.11 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: no-c-ext-rhel8-python3.12 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: no-c-ext-amazon2-python3.12 tasks: - name: .standalone .noauth .nossl !.sync_async - display_name: No C Ext RHEL8 Python3.12 + display_name: No C Ext Amazon2 Python3.12 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.12/bin/python3 - - name: no-c-ext-rhel8-python3.13 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: no-c-ext-amazon2-python3.13 tasks: - name: .replica_set .noauth .nossl !.sync_async - display_name: No C Ext RHEL8 Python3.13 + display_name: No C Ext Amazon2 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # No server tests - name: no-server @@ -755,97 +755,97 @@ buildvariants: - rhel87-small # Ocsp tests - - name: ocsp-rhel8-v4.4-python3.9 + - name: ocsp-amazon2-v4.4-python3.9 tasks: - name: .ocsp - display_name: OCSP RHEL8 v4.4 Python3.9 + display_name: OCSP Amazon2 v4.4 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "4.4" - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: ocsp-rhel8-v5.0-python3.10 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: ocsp-amazon2-v5.0-python3.10 tasks: - name: .ocsp - display_name: OCSP RHEL8 v5.0 Python3.10 + display_name: OCSP Amazon2 v5.0 Python3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "5.0" - PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: ocsp-rhel8-v6.0-python3.11 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: ocsp-amazon2-v6.0-python3.11 tasks: - name: .ocsp - display_name: OCSP RHEL8 v6.0 Python3.11 + display_name: OCSP Amazon2 v6.0 Python3.11 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "6.0" - PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: ocsp-rhel8-v7.0-python3.12 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: ocsp-amazon2-v7.0-python3.12 tasks: - name: .ocsp - display_name: OCSP RHEL8 v7.0 Python3.12 + display_name: OCSP Amazon2 v7.0 Python3.12 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "7.0" - PYTHON_BINARY: /opt/python/3.12/bin/python3 - - name: ocsp-rhel8-v8.0-python3.13 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: ocsp-amazon2-v8.0-python3.13 tasks: - name: .ocsp - display_name: OCSP RHEL8 v8.0 Python3.13 + display_name: OCSP Amazon2 v8.0 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "8.0" - PYTHON_BINARY: /opt/python/3.13/bin/python3 - - name: ocsp-rhel8-rapid-pypy3.10 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: ocsp-amazon2-rapid-pypy3.10 tasks: - name: .ocsp - display_name: OCSP RHEL8 rapid PyPy3.10 + display_name: OCSP Amazon2 rapid PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: rapid - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 - - name: ocsp-rhel8-latest-python3.9 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: ocsp-amazon2-latest-python3.9 tasks: - name: .ocsp - display_name: OCSP RHEL8 latest Python3.9 + display_name: OCSP Amazon2 latest Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: latest - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - name: ocsp-win64-v4.4-python3.9 tasks: - name: .ocsp-rsa !.ocsp-staple @@ -943,39 +943,39 @@ buildvariants: expansions: TEST_NAME: pyopenssl PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3 - - name: pyopenssl-rhel8-python3.10 + - name: pyopenssl-amazon2-python3.10 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL RHEL8 Python3.10 + display_name: PyOpenSSL Amazon2 Python3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: pyopenssl-rhel8-python3.11 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: pyopenssl-amazon2-python3.11 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL RHEL8 Python3.11 + display_name: PyOpenSSL Amazon2 Python3.11 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: pyopenssl-rhel8-python3.12 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: pyopenssl-amazon2-python3.12 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL RHEL8 Python3.12 + display_name: PyOpenSSL Amazon2 Python3.12 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/python/3.12/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - name: pyopenssl-win64-python3.13 tasks: - name: .replica_set .auth .ssl .sync_async @@ -987,137 +987,137 @@ buildvariants: expansions: TEST_NAME: pyopenssl PYTHON_BINARY: C:/python/Python313/python.exe - - name: pyopenssl-rhel8-pypy3.10 + - name: pyopenssl-amazon2-pypy3.10 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL RHEL8 PyPy3.10 + display_name: PyOpenSSL Amazon2 PyPy3.10 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Search index tests - - name: search-index-helpers-rhel8-python3.9 + - name: search-index-helpers-amazon2-python3.9 tasks: - name: .search_index - display_name: Search Index Helpers RHEL8 Python3.9 + display_name: Search Index Helpers Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Server tests - - name: test-rhel8-python3.9-cov-no-c + - name: test-amazon2-python3.9-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test RHEL8 Python3.9 cov No C" + display_name: "* Test Amazon2 Python3.9 cov No C" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-rhel8-python3.9-cov + - name: test-amazon2-python3.9-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test RHEL8 Python3.9 cov" + display_name: "* Test Amazon2 Python3.9 cov" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-rhel8-python3.13-cov-no-c + - name: test-amazon2-python3.13-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test RHEL8 Python3.13 cov No C" + display_name: "* Test Amazon2 Python3.13 cov No C" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage NO_EXT: "1" - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-rhel8-python3.13-cov + - name: test-amazon2-python3.13-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test RHEL8 Python3.13 cov" + display_name: "* Test Amazon2 Python3.13 cov" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-rhel8-pypy3.10-cov-no-c + - name: test-amazon2-pypy3.10-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test RHEL8 PyPy3.10 cov No C" + display_name: "* Test Amazon2 PyPy3.10 cov No C" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage NO_EXT: "1" - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-rhel8-pypy3.10-cov + - name: test-amazon2-pypy3.10-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test RHEL8 PyPy3.10 cov" + display_name: "* Test Amazon2 PyPy3.10 cov" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-rhel8-python3.10 + - name: test-amazon2-python3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test RHEL8 Python3.10" + display_name: "* Test Amazon2 Python3.10" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: test-rhel8-python3.11 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: test-amazon2-python3.11 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test RHEL8 Python3.11" + display_name: "* Test Amazon2 Python3.11" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: test-rhel8-python3.12 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: test-amazon2-python3.12 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test RHEL8 Python3.12" + display_name: "* Test Amazon2 Python3.12" run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/python/3.12/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - name: test-macos-python3.9 tasks: - name: .sharded_cluster .auth .ssl !.sync_async @@ -1224,27 +1224,27 @@ buildvariants: PYTHON_BINARY: C:/python/32/Python313/python.exe # Serverless tests - - name: serverless-rhel8-python3.9 + - name: serverless-amazon2-python3.9 tasks: - name: .serverless - display_name: Serverless RHEL8 Python3.9 + display_name: Serverless Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: serverless-rhel8-python3.13 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: serverless-amazon2-python3.13 tasks: - name: .serverless - display_name: Serverless RHEL8 Python3.13 + display_name: Serverless Amazon2 Python3.13 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g batchtime: 10080 expansions: - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Stable api tests - - name: stable-api-require-v1-rhel8-python3.9-auth + - name: stable-api-require-v1-amazon2-python3.9-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1252,16 +1252,16 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API require v1 RHEL8 Python3.9 Auth + display_name: Stable API require v1 Amazon2 Python3.9 Auth run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: AUTH: auth REQUIRE_API_VERSION: "1" MONGODB_API_VERSION: "1" - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [versionedApi_tag] - - name: stable-api-accept-v2-rhel8-python3.9-auth + - name: stable-api-accept-v2-amazon2-python3.9-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1269,15 +1269,15 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API accept v2 RHEL8 Python3.9 Auth + display_name: Stable API accept v2 Amazon2 Python3.9 Auth run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: AUTH: auth ORCHESTRATION_FILE: versioned-api-testing.json - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [versionedApi_tag] - - name: stable-api-require-v1-rhel8-python3.13-auth + - name: stable-api-require-v1-amazon2-python3.13-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1285,16 +1285,16 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API require v1 RHEL8 Python3.13 Auth + display_name: Stable API require v1 Amazon2 Python3.13 Auth run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: AUTH: auth REQUIRE_API_VERSION: "1" MONGODB_API_VERSION: "1" - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [versionedApi_tag] - - name: stable-api-accept-v2-rhel8-python3.13-auth + - name: stable-api-accept-v2-amazon2-python3.13-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1302,17 +1302,17 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API accept v2 RHEL8 Python3.13 Auth + display_name: Stable API accept v2 Amazon2 Python3.13 Auth run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: AUTH: auth ORCHESTRATION_FILE: versioned-api-testing.json - PYTHON_BINARY: /opt/python/3.13/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [versionedApi_tag] # Storage engine tests - - name: storage-inmemory-rhel8-python3.9 + - name: storage-inmemory-amazon2-python3.9 tasks: - name: .standalone .noauth .nossl .4.0 .sync_async - name: .standalone .noauth .nossl .4.2 .sync_async @@ -1323,19 +1323,19 @@ buildvariants: - name: .standalone .noauth .nossl .8.0 .sync_async - name: .standalone .noauth .nossl .rapid .sync_async - name: .standalone .noauth .nossl .latest .sync_async - display_name: Storage InMemory RHEL8 Python3.9 + display_name: Storage InMemory Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: STORAGE_ENGINE: inmemory - PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: storage-mmapv1-rhel8-python3.9 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + - name: storage-mmapv1-amazon2-python3.9 tasks: - name: .standalone .4.0 .noauth .nossl .sync_async - name: .replica_set .4.0 .noauth .nossl .sync_async - display_name: Storage MMAPv1 RHEL8 Python3.9 + display_name: Storage MMAPv1 Amazon2 Python3.9 run_on: - - rhel87-small + - amazon2-arm64-latest-large-m8g expansions: STORAGE_ENGINE: mmapv1 - PYTHON_BINARY: /opt/python/3.9/bin/python3 + PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 970a9b5ba3..68c9361517 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -70,7 +70,7 @@ class Host: HOSTS["ubuntu22"] = Host("ubuntu22", "ubuntu2204-small", "Ubuntu-22", dict()) HOSTS["rhel7"] = Host("rhel7", "rhel79-small", "RHEL7", dict()) HOSTS["perf"] = Host("perf", "rhel90-dbx-perf-large", "", dict()) -HOSTS["amazon2"] = Host("amazon2", "amazon2-arm64-latest-large-m8g", dict()) +HOSTS["amazon2"] = Host("amazon2", "amazon2-arm64-latest-large-m8g", "Amazon2", dict()) DEFAULT_HOST = HOSTS["rhel8"] DEFAULT_HOST = HOSTS["amazon2"] @@ -143,6 +143,8 @@ def create_variant( def get_python_binary(python: str, host: Host) -> str: """Get the appropriate python binary given a python version and host.""" name = host.name + if name == "amazon2": + return "/opt/mongodbtoolchain/v4/bin/python3" if name in ["win64", "win32"]: if name == "win32": base = "C:/python/32" From 156f7ce588dab43efffb7c48eafdf5d4fa97d547 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 24 Mar 2025 10:10:41 -0500 Subject: [PATCH 3/9] try with test-rhel-arm --- .evergreen/scripts/configure-env.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh index 9ec98bb5be..918285f52f 100755 --- a/.evergreen/scripts/configure-env.sh +++ b/.evergreen/scripts/configure-env.sh @@ -76,6 +76,8 @@ EOT rm -rf $DRIVERS_TOOLS BRANCH=master ORG=mongodb-labs +ORG=blink1073 +BRANCH=test-rhel-arm git clone --branch $BRANCH https://github.com/$ORG/drivers-evergreen-tools.git $DRIVERS_TOOLS cat < ${DRIVERS_TOOLS}/.env From d3a54b85ebda15cb16c020be3262d3a1b6838a93 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 24 Mar 2025 10:25:50 -0500 Subject: [PATCH 4/9] test with amazon2023 --- .evergreen/generated_configs/variants.yml | 438 +++++++++++----------- .evergreen/scripts/generate_config.py | 6 +- 2 files changed, 222 insertions(+), 222 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 22f2ff07cf..98c6330dfc 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -47,20 +47,20 @@ buildvariants: NO_EXT: "1" # Atlas connect tests - - name: atlas-connect-amazon2-python3.9 + - name: atlas-connect-amazon2023-python3.9 tasks: - name: .atlas_connect - display_name: Atlas connect Amazon2 Python3.9 + display_name: Atlas connect Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: atlas-connect-amazon2-python3.13 + - name: atlas-connect-amazon2023-python3.13 tasks: - name: .atlas_connect - display_name: Atlas connect Amazon2 Python3.13 + display_name: Atlas connect Amazon2023 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 @@ -141,98 +141,98 @@ buildvariants: - rhel87-small # Compression tests - - name: compression-snappy-amazon2-python3.9-no-c + - name: compression-snappy-amazon2023-python3.9-no-c tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy Amazon2 Python3.9 No C + display_name: Compression snappy Amazon2023 Python3.9 No C run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: snappy NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-snappy-amazon2-python3.10 + - name: compression-snappy-amazon2023-python3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy Amazon2 Python3.10 + display_name: Compression snappy Amazon2023 Python3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: snappy PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zlib-amazon2-python3.11-no-c + - name: compression-zlib-amazon2023-python3.11-no-c tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib Amazon2 Python3.11 No C + display_name: Compression zlib Amazon2023 Python3.11 No C run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: zlib NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zlib-amazon2-python3.12 + - name: compression-zlib-amazon2023-python3.12 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib Amazon2 Python3.12 + display_name: Compression zlib Amazon2023 Python3.12 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: zlib PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zstd-amazon2-python3.13-no-c + - name: compression-zstd-amazon2023-python3.13-no-c tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd Amazon2 Python3.13 No C + display_name: Compression zstd Amazon2023 Python3.13 No C run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: zstd NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zstd-amazon2-python3.9 + - name: compression-zstd-amazon2023-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd Amazon2 Python3.9 + display_name: Compression zstd Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: zstd PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-snappy-amazon2-pypy3.10 + - name: compression-snappy-amazon2023-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy Amazon2 PyPy3.10 + display_name: Compression snappy Amazon2023 PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: snappy PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zlib-amazon2-pypy3.10 + - name: compression-zlib-amazon2023-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib Amazon2 PyPy3.10 + display_name: Compression zlib Amazon2023 PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: zlib PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zstd-amazon2-pypy3.10 + - name: compression-zstd-amazon2023-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd Amazon2 PyPy3.10 + display_name: Compression zstd Amazon2023 PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COMPRESSORS: zstd PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Disable test commands tests - - name: disable-test-commands-amazon2-python3.9 + - name: disable-test-commands-amazon2023-python3.9 tasks: - name: .latest .sync_async - display_name: Disable test commands Amazon2 Python3.9 + display_name: Disable test commands Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: AUTH: auth SSL: ssl @@ -240,164 +240,164 @@ buildvariants: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Doctests tests - - name: doctests-amazon2-python3.9 + - name: doctests-amazon2023-python3.9 tasks: - name: .doctests - display_name: Doctests Amazon2 Python3.9 + display_name: Doctests Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Encryption tests - - name: encryption-amazon2-python3.9 + - name: encryption-amazon2023-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption Amazon2 Python3.9 + display_name: Encryption Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-amazon2-python3.13 + - name: encryption-amazon2023-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption Amazon2 Python3.13 + display_name: Encryption Amazon2023 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-amazon2-pypy3.10 + - name: encryption-amazon2023-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption Amazon2 PyPy3.10 + display_name: Encryption Amazon2023 PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-amazon2-python3.9 + - name: encryption-crypt_shared-amazon2023-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared Amazon2 Python3.9 + display_name: Encryption crypt_shared Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-amazon2-python3.13 + - name: encryption-crypt_shared-amazon2023-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared Amazon2 Python3.13 + display_name: Encryption crypt_shared Amazon2023 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-amazon2-pypy3.10 + - name: encryption-crypt_shared-amazon2023-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared Amazon2 PyPy3.10 + display_name: Encryption crypt_shared Amazon2023 PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-amazon2-python3.9 + - name: encryption-pyopenssl-amazon2023-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL Amazon2 Python3.9 + display_name: Encryption PyOpenSSL Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-amazon2-python3.13 + - name: encryption-pyopenssl-amazon2023-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL Amazon2 Python3.13 + display_name: Encryption PyOpenSSL Amazon2023 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-amazon2-pypy3.10 + - name: encryption-pyopenssl-amazon2023-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL Amazon2 PyPy3.10 + display_name: Encryption PyOpenSSL Amazon2023 PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [encryption_tag] - - name: encryption-amazon2-python3.10 + - name: encryption-amazon2023-python3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - display_name: Encryption Amazon2 Python3.10 + display_name: Encryption Amazon2023 Python3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: TEST_NAME: encryption PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: encryption-crypt_shared-amazon2-python3.11 + - name: encryption-crypt_shared-amazon2023-python3.11 tasks: - name: .replica_set .noauth .ssl .sync_async - display_name: Encryption crypt_shared Amazon2 Python3.11 + display_name: Encryption crypt_shared Amazon2023 Python3.11 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: encryption-pyopenssl-amazon2-python3.12 + - name: encryption-pyopenssl-amazon2023-python3.12 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL Amazon2 Python3.12 + display_name: Encryption PyOpenSSL Amazon2023 Python3.12 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl @@ -504,28 +504,28 @@ buildvariants: - macos-14 expansions: PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3 - - name: auth-enterprise-amazon2-python3.10 + - name: auth-enterprise-amazon2023-python3.10 tasks: - name: .enterprise_auth - display_name: Auth Enterprise Amazon2 Python3.10 + display_name: Auth Enterprise Amazon2023 Python3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: auth-enterprise-amazon2-python3.11 + - name: auth-enterprise-amazon2023-python3.11 tasks: - name: .enterprise_auth - display_name: Auth Enterprise Amazon2 Python3.11 + display_name: Auth Enterprise Amazon2023 Python3.11 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: auth-enterprise-amazon2-python3.12 + - name: auth-enterprise-amazon2023-python3.12 tasks: - name: .enterprise_auth - display_name: Auth Enterprise Amazon2 Python3.12 + display_name: Auth Enterprise Amazon2023 Python3.12 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - name: auth-enterprise-win64-python3.13 @@ -536,12 +536,12 @@ buildvariants: - windows-64-vsMulti-small expansions: PYTHON_BINARY: C:/python/Python313/python.exe - - name: auth-enterprise-amazon2-pypy3.10 + - name: auth-enterprise-amazon2023-pypy3.10 tasks: - name: .enterprise_auth - display_name: Auth Enterprise Amazon2 PyPy3.10 + display_name: Auth Enterprise Amazon2023 PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 @@ -572,45 +572,45 @@ buildvariants: PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.13/bin/python3t # Green framework tests - - name: green-eventlet-amazon2-python3.9 + - name: green-eventlet-amazon2023-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Eventlet Amazon2 Python3.9 + display_name: Green Eventlet Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: GREEN_FRAMEWORK: eventlet AUTH: auth SSL: ssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: green-gevent-amazon2-python3.9 + - name: green-gevent-amazon2023-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Gevent Amazon2 Python3.9 + display_name: Green Gevent Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: GREEN_FRAMEWORK: gevent AUTH: auth SSL: ssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: green-eventlet-amazon2-python3.13 + - name: green-eventlet-amazon2023-python3.13 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Eventlet Amazon2 Python3.13 + display_name: Green Eventlet Amazon2023 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: GREEN_FRAMEWORK: eventlet AUTH: auth SSL: ssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: green-gevent-amazon2-python3.13 + - name: green-gevent-amazon2023-python3.13 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Gevent Amazon2 Python3.13 + display_name: Green Gevent Amazon2023 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: GREEN_FRAMEWORK: gevent AUTH: auth @@ -618,64 +618,64 @@ buildvariants: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Load balancer tests - - name: load-balancer-amazon2-v6.0-python3.9 + - name: load-balancer-amazon2023-v6.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2 v6.0 Python3.9 + display_name: Load Balancer Amazon2023 v6.0 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: "6.0" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: load-balancer-amazon2-v7.0-python3.9 + - name: load-balancer-amazon2023-v7.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2 v7.0 Python3.9 + display_name: Load Balancer Amazon2023 v7.0 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: "7.0" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: load-balancer-amazon2-v8.0-python3.9 + - name: load-balancer-amazon2023-v8.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2 v8.0 Python3.9 + display_name: Load Balancer Amazon2023 v8.0 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: "8.0" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: load-balancer-amazon2-rapid-python3.9 + - name: load-balancer-amazon2023-rapid-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2 rapid Python3.9 + display_name: Load Balancer Amazon2023 rapid Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: rapid PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: load-balancer-amazon2-latest-python3.9 + - name: load-balancer-amazon2023-latest-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2 latest Python3.9 + display_name: Load Balancer Amazon2023 latest Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: VERSION: latest PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Mockupdb tests - - name: mockupdb-amazon2-python3.9 + - name: mockupdb-amazon2023-python3.9 tasks: - name: .mockupdb - display_name: MockupDB Amazon2 Python3.9 + display_name: MockupDB Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 @@ -700,48 +700,48 @@ buildvariants: PYTHON_BINARY: /opt/python/3.13/bin/python3 # No c ext tests - - name: no-c-ext-amazon2-python3.9 + - name: no-c-ext-amazon2023-python3.9 tasks: - name: .standalone .noauth .nossl !.sync_async - display_name: No C Ext Amazon2 Python3.9 + display_name: No C Ext Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: no-c-ext-amazon2-python3.10 + - name: no-c-ext-amazon2023-python3.10 tasks: - name: .replica_set .noauth .nossl !.sync_async - display_name: No C Ext Amazon2 Python3.10 + display_name: No C Ext Amazon2023 Python3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: no-c-ext-amazon2-python3.11 + - name: no-c-ext-amazon2023-python3.11 tasks: - name: .sharded_cluster .noauth .nossl !.sync_async - display_name: No C Ext Amazon2 Python3.11 + display_name: No C Ext Amazon2023 Python3.11 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: no-c-ext-amazon2-python3.12 + - name: no-c-ext-amazon2023-python3.12 tasks: - name: .standalone .noauth .nossl !.sync_async - display_name: No C Ext Amazon2 Python3.12 + display_name: No C Ext Amazon2023 Python3.12 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: no-c-ext-amazon2-python3.13 + - name: no-c-ext-amazon2023-python3.13 tasks: - name: .replica_set .noauth .nossl !.sync_async - display_name: No C Ext Amazon2 Python3.13 + display_name: No C Ext Amazon2023 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 @@ -755,12 +755,12 @@ buildvariants: - rhel87-small # Ocsp tests - - name: ocsp-amazon2-v4.4-python3.9 + - name: ocsp-amazon2023-v4.4-python3.9 tasks: - name: .ocsp - display_name: OCSP Amazon2 v4.4 Python3.9 + display_name: OCSP Amazon2023 v4.4 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth @@ -768,12 +768,12 @@ buildvariants: TOPOLOGY: server VERSION: "4.4" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2-v5.0-python3.10 + - name: ocsp-amazon2023-v5.0-python3.10 tasks: - name: .ocsp - display_name: OCSP Amazon2 v5.0 Python3.10 + display_name: OCSP Amazon2023 v5.0 Python3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth @@ -781,12 +781,12 @@ buildvariants: TOPOLOGY: server VERSION: "5.0" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2-v6.0-python3.11 + - name: ocsp-amazon2023-v6.0-python3.11 tasks: - name: .ocsp - display_name: OCSP Amazon2 v6.0 Python3.11 + display_name: OCSP Amazon2023 v6.0 Python3.11 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth @@ -794,12 +794,12 @@ buildvariants: TOPOLOGY: server VERSION: "6.0" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2-v7.0-python3.12 + - name: ocsp-amazon2023-v7.0-python3.12 tasks: - name: .ocsp - display_name: OCSP Amazon2 v7.0 Python3.12 + display_name: OCSP Amazon2023 v7.0 Python3.12 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth @@ -807,12 +807,12 @@ buildvariants: TOPOLOGY: server VERSION: "7.0" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2-v8.0-python3.13 + - name: ocsp-amazon2023-v8.0-python3.13 tasks: - name: .ocsp - display_name: OCSP Amazon2 v8.0 Python3.13 + display_name: OCSP Amazon2023 v8.0 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth @@ -820,12 +820,12 @@ buildvariants: TOPOLOGY: server VERSION: "8.0" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2-rapid-pypy3.10 + - name: ocsp-amazon2023-rapid-pypy3.10 tasks: - name: .ocsp - display_name: OCSP Amazon2 rapid PyPy3.10 + display_name: OCSP Amazon2023 rapid PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth @@ -833,12 +833,12 @@ buildvariants: TOPOLOGY: server VERSION: rapid PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2-latest-python3.9 + - name: ocsp-amazon2023-latest-python3.9 tasks: - name: .ocsp - display_name: OCSP Amazon2 latest Python3.9 + display_name: OCSP Amazon2023 latest Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: AUTH: noauth @@ -943,35 +943,35 @@ buildvariants: expansions: TEST_NAME: pyopenssl PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3 - - name: pyopenssl-amazon2-python3.10 + - name: pyopenssl-amazon2023-python3.10 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL Amazon2 Python3.10 + display_name: PyOpenSSL Amazon2023 Python3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: pyopenssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: pyopenssl-amazon2-python3.11 + - name: pyopenssl-amazon2023-python3.11 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL Amazon2 Python3.11 + display_name: PyOpenSSL Amazon2023 Python3.11 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: pyopenssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: pyopenssl-amazon2-python3.12 + - name: pyopenssl-amazon2023-python3.12 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL Amazon2 Python3.12 + display_name: PyOpenSSL Amazon2023 Python3.12 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: pyopenssl @@ -987,134 +987,134 @@ buildvariants: expansions: TEST_NAME: pyopenssl PYTHON_BINARY: C:/python/Python313/python.exe - - name: pyopenssl-amazon2-pypy3.10 + - name: pyopenssl-amazon2023-pypy3.10 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL Amazon2 PyPy3.10 + display_name: PyOpenSSL Amazon2023 PyPy3.10 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: TEST_NAME: pyopenssl PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Search index tests - - name: search-index-helpers-amazon2-python3.9 + - name: search-index-helpers-amazon2023-python3.9 tasks: - name: .search_index - display_name: Search Index Helpers Amazon2 Python3.9 + display_name: Search Index Helpers Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Server tests - - name: test-amazon2-python3.9-cov-no-c + - name: test-amazon2023-python3.9-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2 Python3.9 cov No C" + display_name: "* Test Amazon2023 Python3.9 cov No C" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-amazon2-python3.9-cov + - name: test-amazon2023-python3.9-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2 Python3.9 cov" + display_name: "* Test Amazon2023 Python3.9 cov" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-amazon2-python3.13-cov-no-c + - name: test-amazon2023-python3.13-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2 Python3.13 cov No C" + display_name: "* Test Amazon2023 Python3.13 cov No C" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-amazon2-python3.13-cov + - name: test-amazon2023-python3.13-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2 Python3.13 cov" + display_name: "* Test Amazon2023 Python3.13 cov" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-amazon2-pypy3.10-cov-no-c + - name: test-amazon2023-pypy3.10-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2 PyPy3.10 cov No C" + display_name: "* Test Amazon2023 PyPy3.10 cov No C" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage NO_EXT: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-amazon2-pypy3.10-cov + - name: test-amazon2023-pypy3.10-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2 PyPy3.10 cov" + display_name: "* Test Amazon2023 PyPy3.10 cov" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [coverage_tag] - - name: test-amazon2-python3.10 + - name: test-amazon2023-python3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test Amazon2 Python3.10" + display_name: "* Test Amazon2023 Python3.10" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: test-amazon2-python3.11 + - name: test-amazon2023-python3.11 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test Amazon2 Python3.11" + display_name: "* Test Amazon2023 Python3.11" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: test-amazon2-python3.12 + - name: test-amazon2023-python3.12 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test Amazon2 Python3.12" + display_name: "* Test Amazon2023 Python3.12" run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: COVERAGE: coverage PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 @@ -1224,27 +1224,27 @@ buildvariants: PYTHON_BINARY: C:/python/32/Python313/python.exe # Serverless tests - - name: serverless-amazon2-python3.9 + - name: serverless-amazon2023-python3.9 tasks: - name: .serverless - display_name: Serverless Amazon2 Python3.9 + display_name: Serverless Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: serverless-amazon2-python3.13 + - name: serverless-amazon2023-python3.13 tasks: - name: .serverless - display_name: Serverless Amazon2 Python3.13 + display_name: Serverless Amazon2023 Python3.13 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g batchtime: 10080 expansions: PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 # Stable api tests - - name: stable-api-require-v1-amazon2-python3.9-auth + - name: stable-api-require-v1-amazon2023-python3.9-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1252,16 +1252,16 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API require v1 Amazon2 Python3.9 Auth + display_name: Stable API require v1 Amazon2023 Python3.9 Auth run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: AUTH: auth REQUIRE_API_VERSION: "1" MONGODB_API_VERSION: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [versionedApi_tag] - - name: stable-api-accept-v2-amazon2-python3.9-auth + - name: stable-api-accept-v2-amazon2023-python3.9-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1269,15 +1269,15 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API accept v2 Amazon2 Python3.9 Auth + display_name: Stable API accept v2 Amazon2023 Python3.9 Auth run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: AUTH: auth ORCHESTRATION_FILE: versioned-api-testing.json PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [versionedApi_tag] - - name: stable-api-require-v1-amazon2-python3.13-auth + - name: stable-api-require-v1-amazon2023-python3.13-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1285,16 +1285,16 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API require v1 Amazon2 Python3.13 Auth + display_name: Stable API require v1 Amazon2023 Python3.13 Auth run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: AUTH: auth REQUIRE_API_VERSION: "1" MONGODB_API_VERSION: "1" PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 tags: [versionedApi_tag] - - name: stable-api-accept-v2-amazon2-python3.13-auth + - name: stable-api-accept-v2-amazon2023-python3.13-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1302,9 +1302,9 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API accept v2 Amazon2 Python3.13 Auth + display_name: Stable API accept v2 Amazon2023 Python3.13 Auth run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: AUTH: auth ORCHESTRATION_FILE: versioned-api-testing.json @@ -1312,7 +1312,7 @@ buildvariants: tags: [versionedApi_tag] # Storage engine tests - - name: storage-inmemory-amazon2-python3.9 + - name: storage-inmemory-amazon2023-python3.9 tasks: - name: .standalone .noauth .nossl .4.0 .sync_async - name: .standalone .noauth .nossl .4.2 .sync_async @@ -1323,19 +1323,19 @@ buildvariants: - name: .standalone .noauth .nossl .8.0 .sync_async - name: .standalone .noauth .nossl .rapid .sync_async - name: .standalone .noauth .nossl .latest .sync_async - display_name: Storage InMemory Amazon2 Python3.9 + display_name: Storage InMemory Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: STORAGE_ENGINE: inmemory PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: storage-mmapv1-amazon2-python3.9 + - name: storage-mmapv1-amazon2023-python3.9 tasks: - name: .standalone .4.0 .noauth .nossl .sync_async - name: .replica_set .4.0 .noauth .nossl .sync_async - display_name: Storage MMAPv1 Amazon2 Python3.9 + display_name: Storage MMAPv1 Amazon2023 Python3.9 run_on: - - amazon2-arm64-latest-large-m8g + - amazon2023-arm64-latest-large-m8g expansions: STORAGE_ENGINE: mmapv1 PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 68c9361517..e81a10a29d 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -70,9 +70,9 @@ class Host: HOSTS["ubuntu22"] = Host("ubuntu22", "ubuntu2204-small", "Ubuntu-22", dict()) HOSTS["rhel7"] = Host("rhel7", "rhel79-small", "RHEL7", dict()) HOSTS["perf"] = Host("perf", "rhel90-dbx-perf-large", "", dict()) -HOSTS["amazon2"] = Host("amazon2", "amazon2-arm64-latest-large-m8g", "Amazon2", dict()) +HOSTS["amazon2023"] = Host("amazon2023", "amazon2023-arm64-latest-large-m8g", "Amazon2023", dict()) DEFAULT_HOST = HOSTS["rhel8"] -DEFAULT_HOST = HOSTS["amazon2"] +DEFAULT_HOST = HOSTS["amazon2023"] # Other hosts OTHER_HOSTS = ["RHEL9-FIPS", "RHEL8-zseries", "RHEL8-POWER8", "RHEL8-arm64"] @@ -143,7 +143,7 @@ def create_variant( def get_python_binary(python: str, host: Host) -> str: """Get the appropriate python binary given a python version and host.""" name = host.name - if name == "amazon2": + if name == "amazon2023": return "/opt/mongodbtoolchain/v4/bin/python3" if name in ["win64", "win32"]: if name == "win32": From 02454640fd73103184175f73c959f5411e1010f2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 24 Mar 2025 15:24:43 -0500 Subject: [PATCH 5/9] add amazon2023 test --- .evergreen/generated_configs/variants.yml | 593 +++++++++++----------- .evergreen/scripts/generate_config.py | 20 +- 2 files changed, 314 insertions(+), 299 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 98c6330dfc..a4b2de40ba 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -45,24 +45,33 @@ buildvariants: batchtime: 10080 expansions: NO_EXT: "1" + - name: other-hosts-amazon2023 + tasks: + - name: .6.0 .standalone !.sync_async + display_name: Other hosts Amazon2023 + run_on: + - amazon2023-arm64-latest-large-m8g + batchtime: 10080 + expansions: + NO_EXT: "1" # Atlas connect tests - - name: atlas-connect-amazon2023-python3.9 + - name: atlas-connect-rhel8-python3.9 tasks: - name: .atlas_connect - display_name: Atlas connect Amazon2023 Python3.9 + display_name: Atlas connect RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: atlas-connect-amazon2023-python3.13 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: atlas-connect-rhel8-python3.13 tasks: - name: .atlas_connect - display_name: Atlas connect Amazon2023 Python3.13 + display_name: Atlas connect RHEL8 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 # Atlas data lake tests - name: atlas-data-lake-ubuntu-22-python3.9 @@ -141,267 +150,267 @@ buildvariants: - rhel87-small # Compression tests - - name: compression-snappy-amazon2023-python3.9-no-c + - name: compression-snappy-rhel8-python3.9-no-c tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy Amazon2023 Python3.9 No C + display_name: Compression snappy RHEL8 Python3.9 No C run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: snappy NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-snappy-amazon2023-python3.10 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: compression-snappy-rhel8-python3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy Amazon2023 Python3.10 + display_name: Compression snappy RHEL8 Python3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: snappy - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zlib-amazon2023-python3.11-no-c + PYTHON_BINARY: /opt/python/3.10/bin/python3 + - name: compression-zlib-rhel8-python3.11-no-c tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib Amazon2023 Python3.11 No C + display_name: Compression zlib RHEL8 Python3.11 No C run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: zlib NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zlib-amazon2023-python3.12 + PYTHON_BINARY: /opt/python/3.11/bin/python3 + - name: compression-zlib-rhel8-python3.12 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib Amazon2023 Python3.12 + display_name: Compression zlib RHEL8 Python3.12 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: zlib - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zstd-amazon2023-python3.13-no-c + PYTHON_BINARY: /opt/python/3.12/bin/python3 + - name: compression-zstd-rhel8-python3.13-no-c tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd Amazon2023 Python3.13 No C + display_name: Compression zstd RHEL8 Python3.13 No C run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: zstd NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zstd-amazon2023-python3.9 + PYTHON_BINARY: /opt/python/3.13/bin/python3 + - name: compression-zstd-rhel8-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd Amazon2023 Python3.9 + display_name: Compression zstd RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: zstd - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-snappy-amazon2023-pypy3.10 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: compression-snappy-rhel8-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression snappy Amazon2023 PyPy3.10 + display_name: Compression snappy RHEL8 PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: snappy - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zlib-amazon2023-pypy3.10 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + - name: compression-zlib-rhel8-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Compression zlib Amazon2023 PyPy3.10 + display_name: Compression zlib RHEL8 PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: zlib - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: compression-zstd-amazon2023-pypy3.10 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + - name: compression-zstd-rhel8-pypy3.10 tasks: - name: .standalone .noauth .nossl .sync_async !.4.0 - display_name: Compression zstd Amazon2023 PyPy3.10 + display_name: Compression zstd RHEL8 PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COMPRESSORS: zstd - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 # Disable test commands tests - - name: disable-test-commands-amazon2023-python3.9 + - name: disable-test-commands-rhel8-python3.9 tasks: - name: .latest .sync_async - display_name: Disable test commands Amazon2023 Python3.9 + display_name: Disable test commands RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: AUTH: auth SSL: ssl DISABLE_TEST_COMMANDS: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 # Doctests tests - - name: doctests-amazon2023-python3.9 + - name: doctests-rhel8-python3.9 tasks: - name: .doctests - display_name: Doctests Amazon2023 Python3.9 + display_name: Doctests RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 # Encryption tests - - name: encryption-amazon2023-python3.9 + - name: encryption-rhel8-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption Amazon2023 Python3.9 + display_name: Encryption RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 tags: [encryption_tag] - - name: encryption-amazon2023-python3.13 + - name: encryption-rhel8-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption Amazon2023 Python3.13 + display_name: Encryption RHEL8 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 tags: [encryption_tag] - - name: encryption-amazon2023-pypy3.10 + - name: encryption-rhel8-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption Amazon2023 PyPy3.10 + display_name: Encryption RHEL8 PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-amazon2023-python3.9 + - name: encryption-crypt_shared-rhel8-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared Amazon2023 Python3.9 + display_name: Encryption crypt_shared RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-amazon2023-python3.13 + - name: encryption-crypt_shared-rhel8-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared Amazon2023 Python3.13 + display_name: Encryption crypt_shared RHEL8 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 tags: [encryption_tag] - - name: encryption-crypt_shared-amazon2023-pypy3.10 + - name: encryption-crypt_shared-rhel8-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption crypt_shared Amazon2023 PyPy3.10 + display_name: Encryption crypt_shared RHEL8 PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-amazon2023-python3.9 + - name: encryption-pyopenssl-rhel8-python3.9 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL Amazon2023 Python3.9 + display_name: Encryption PyOpenSSL RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-amazon2023-python3.13 + - name: encryption-pyopenssl-rhel8-python3.13 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL Amazon2023 Python3.13 + display_name: Encryption PyOpenSSL RHEL8 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 tags: [encryption_tag] - - name: encryption-pyopenssl-amazon2023-pypy3.10 + - name: encryption-pyopenssl-rhel8-pypy3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL Amazon2023 PyPy3.10 + display_name: Encryption PyOpenSSL RHEL8 PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 tags: [encryption_tag] - - name: encryption-amazon2023-python3.10 + - name: encryption-rhel8-python3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - display_name: Encryption Amazon2023 Python3.10 + display_name: Encryption RHEL8 Python3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: TEST_NAME: encryption - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: encryption-crypt_shared-amazon2023-python3.11 + PYTHON_BINARY: /opt/python/3.10/bin/python3 + - name: encryption-crypt_shared-rhel8-python3.11 tasks: - name: .replica_set .noauth .ssl .sync_async - display_name: Encryption crypt_shared Amazon2023 Python3.11 + display_name: Encryption crypt_shared RHEL8 Python3.11 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: TEST_NAME: encryption TEST_CRYPT_SHARED: "true" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: encryption-pyopenssl-amazon2023-python3.12 + PYTHON_BINARY: /opt/python/3.11/bin/python3 + - name: encryption-pyopenssl-rhel8-python3.12 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Encryption PyOpenSSL Amazon2023 Python3.12 + display_name: Encryption PyOpenSSL RHEL8 Python3.12 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: TEST_NAME: encryption SUB_TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.12/bin/python3 - name: encryption-macos-python3.9 tasks: - name: .latest .replica_set .sync_async @@ -504,30 +513,30 @@ buildvariants: - macos-14 expansions: PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3 - - name: auth-enterprise-amazon2023-python3.10 + - name: auth-enterprise-rhel8-python3.10 tasks: - name: .enterprise_auth - display_name: Auth Enterprise Amazon2023 Python3.10 + display_name: Auth Enterprise RHEL8 Python3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: auth-enterprise-amazon2023-python3.11 + PYTHON_BINARY: /opt/python/3.10/bin/python3 + - name: auth-enterprise-rhel8-python3.11 tasks: - name: .enterprise_auth - display_name: Auth Enterprise Amazon2023 Python3.11 + display_name: Auth Enterprise RHEL8 Python3.11 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: auth-enterprise-amazon2023-python3.12 + PYTHON_BINARY: /opt/python/3.11/bin/python3 + - name: auth-enterprise-rhel8-python3.12 tasks: - name: .enterprise_auth - display_name: Auth Enterprise Amazon2023 Python3.12 + display_name: Auth Enterprise RHEL8 Python3.12 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.12/bin/python3 - name: auth-enterprise-win64-python3.13 tasks: - name: .enterprise_auth @@ -536,14 +545,14 @@ buildvariants: - windows-64-vsMulti-small expansions: PYTHON_BINARY: C:/python/Python313/python.exe - - name: auth-enterprise-amazon2023-pypy3.10 + - name: auth-enterprise-rhel8-pypy3.10 tasks: - name: .enterprise_auth - display_name: Auth Enterprise Amazon2023 PyPy3.10 + display_name: Auth Enterprise RHEL8 PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 # Free threaded tests - name: free-threaded-rhel8-python3.13t @@ -572,112 +581,112 @@ buildvariants: PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.13/bin/python3t # Green framework tests - - name: green-eventlet-amazon2023-python3.9 + - name: green-eventlet-rhel8-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Eventlet Amazon2023 Python3.9 + display_name: Green Eventlet RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: GREEN_FRAMEWORK: eventlet AUTH: auth SSL: ssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: green-gevent-amazon2023-python3.9 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: green-gevent-rhel8-python3.9 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Gevent Amazon2023 Python3.9 + display_name: Green Gevent RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: GREEN_FRAMEWORK: gevent AUTH: auth SSL: ssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: green-eventlet-amazon2023-python3.13 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: green-eventlet-rhel8-python3.13 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Eventlet Amazon2023 Python3.13 + display_name: Green Eventlet RHEL8 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: GREEN_FRAMEWORK: eventlet AUTH: auth SSL: ssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: green-gevent-amazon2023-python3.13 + PYTHON_BINARY: /opt/python/3.13/bin/python3 + - name: green-gevent-rhel8-python3.13 tasks: - name: .standalone .noauth .nossl .sync_async - display_name: Green Gevent Amazon2023 Python3.13 + display_name: Green Gevent RHEL8 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: GREEN_FRAMEWORK: gevent AUTH: auth SSL: ssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 # Load balancer tests - - name: load-balancer-amazon2023-v6.0-python3.9 + - name: load-balancer-rhel8-v6.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2023 v6.0 Python3.9 + display_name: Load Balancer RHEL8 v6.0 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: VERSION: "6.0" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: load-balancer-amazon2023-v7.0-python3.9 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: load-balancer-rhel8-v7.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2023 v7.0 Python3.9 + display_name: Load Balancer RHEL8 v7.0 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: VERSION: "7.0" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: load-balancer-amazon2023-v8.0-python3.9 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: load-balancer-rhel8-v8.0-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2023 v8.0 Python3.9 + display_name: Load Balancer RHEL8 v8.0 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: VERSION: "8.0" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: load-balancer-amazon2023-rapid-python3.9 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: load-balancer-rhel8-rapid-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2023 rapid Python3.9 + display_name: Load Balancer RHEL8 rapid Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: VERSION: rapid - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: load-balancer-amazon2023-latest-python3.9 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: load-balancer-rhel8-latest-python3.9 tasks: - name: .load-balancer - display_name: Load Balancer Amazon2023 latest Python3.9 + display_name: Load Balancer RHEL8 latest Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: VERSION: latest - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 # Mockupdb tests - - name: mockupdb-amazon2023-python3.9 + - name: mockupdb-rhel8-python3.9 tasks: - name: .mockupdb - display_name: MockupDB Amazon2023 Python3.9 + display_name: MockupDB RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 # Mod wsgi tests - name: mod_wsgi-ubuntu-22-python3.9 @@ -700,51 +709,51 @@ buildvariants: PYTHON_BINARY: /opt/python/3.13/bin/python3 # No c ext tests - - name: no-c-ext-amazon2023-python3.9 + - name: no-c-ext-rhel8-python3.9 tasks: - name: .standalone .noauth .nossl !.sync_async - display_name: No C Ext Amazon2023 Python3.9 + display_name: No C Ext RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: no-c-ext-amazon2023-python3.10 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: no-c-ext-rhel8-python3.10 tasks: - name: .replica_set .noauth .nossl !.sync_async - display_name: No C Ext Amazon2023 Python3.10 + display_name: No C Ext RHEL8 Python3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: no-c-ext-amazon2023-python3.11 + PYTHON_BINARY: /opt/python/3.10/bin/python3 + - name: no-c-ext-rhel8-python3.11 tasks: - name: .sharded_cluster .noauth .nossl !.sync_async - display_name: No C Ext Amazon2023 Python3.11 + display_name: No C Ext RHEL8 Python3.11 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: no-c-ext-amazon2023-python3.12 + PYTHON_BINARY: /opt/python/3.11/bin/python3 + - name: no-c-ext-rhel8-python3.12 tasks: - name: .standalone .noauth .nossl !.sync_async - display_name: No C Ext Amazon2023 Python3.12 + display_name: No C Ext RHEL8 Python3.12 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: no-c-ext-amazon2023-python3.13 + PYTHON_BINARY: /opt/python/3.12/bin/python3 + - name: no-c-ext-rhel8-python3.13 tasks: - name: .replica_set .noauth .nossl !.sync_async - display_name: No C Ext Amazon2023 Python3.13 + display_name: No C Ext RHEL8 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 # No server tests - name: no-server @@ -755,97 +764,97 @@ buildvariants: - rhel87-small # Ocsp tests - - name: ocsp-amazon2023-v4.4-python3.9 + - name: ocsp-rhel8-v4.4-python3.9 tasks: - name: .ocsp - display_name: OCSP Amazon2023 v4.4 Python3.9 + display_name: OCSP RHEL8 v4.4 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "4.4" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2023-v5.0-python3.10 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: ocsp-rhel8-v5.0-python3.10 tasks: - name: .ocsp - display_name: OCSP Amazon2023 v5.0 Python3.10 + display_name: OCSP RHEL8 v5.0 Python3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "5.0" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2023-v6.0-python3.11 + PYTHON_BINARY: /opt/python/3.10/bin/python3 + - name: ocsp-rhel8-v6.0-python3.11 tasks: - name: .ocsp - display_name: OCSP Amazon2023 v6.0 Python3.11 + display_name: OCSP RHEL8 v6.0 Python3.11 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "6.0" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2023-v7.0-python3.12 + PYTHON_BINARY: /opt/python/3.11/bin/python3 + - name: ocsp-rhel8-v7.0-python3.12 tasks: - name: .ocsp - display_name: OCSP Amazon2023 v7.0 Python3.12 + display_name: OCSP RHEL8 v7.0 Python3.12 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "7.0" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2023-v8.0-python3.13 + PYTHON_BINARY: /opt/python/3.12/bin/python3 + - name: ocsp-rhel8-v8.0-python3.13 tasks: - name: .ocsp - display_name: OCSP Amazon2023 v8.0 Python3.13 + display_name: OCSP RHEL8 v8.0 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: "8.0" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2023-rapid-pypy3.10 + PYTHON_BINARY: /opt/python/3.13/bin/python3 + - name: ocsp-rhel8-rapid-pypy3.10 tasks: - name: .ocsp - display_name: OCSP Amazon2023 rapid PyPy3.10 + display_name: OCSP RHEL8 rapid PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: rapid - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: ocsp-amazon2023-latest-python3.9 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 + - name: ocsp-rhel8-latest-python3.9 tasks: - name: .ocsp - display_name: OCSP Amazon2023 latest Python3.9 + display_name: OCSP RHEL8 latest Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: AUTH: noauth SSL: ssl TOPOLOGY: server VERSION: latest - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 - name: ocsp-win64-v4.4-python3.9 tasks: - name: .ocsp-rsa !.ocsp-staple @@ -943,39 +952,39 @@ buildvariants: expansions: TEST_NAME: pyopenssl PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3 - - name: pyopenssl-amazon2023-python3.10 + - name: pyopenssl-rhel8-python3.10 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL Amazon2023 Python3.10 + display_name: PyOpenSSL RHEL8 Python3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: pyopenssl-amazon2023-python3.11 + PYTHON_BINARY: /opt/python/3.10/bin/python3 + - name: pyopenssl-rhel8-python3.11 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL Amazon2023 Python3.11 + display_name: PyOpenSSL RHEL8 Python3.11 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: pyopenssl-amazon2023-python3.12 + PYTHON_BINARY: /opt/python/3.11/bin/python3 + - name: pyopenssl-rhel8-python3.12 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL Amazon2023 Python3.12 + display_name: PyOpenSSL RHEL8 Python3.12 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.12/bin/python3 - name: pyopenssl-win64-python3.13 tasks: - name: .replica_set .auth .ssl .sync_async @@ -987,137 +996,137 @@ buildvariants: expansions: TEST_NAME: pyopenssl PYTHON_BINARY: C:/python/Python313/python.exe - - name: pyopenssl-amazon2023-pypy3.10 + - name: pyopenssl-rhel8-pypy3.10 tasks: - name: .replica_set .auth .ssl .sync_async - name: .7.0 .auth .ssl .sync_async - display_name: PyOpenSSL Amazon2023 PyPy3.10 + display_name: PyOpenSSL RHEL8 PyPy3.10 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: TEST_NAME: pyopenssl - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 # Search index tests - - name: search-index-helpers-amazon2023-python3.9 + - name: search-index-helpers-rhel8-python3.9 tasks: - name: .search_index - display_name: Search Index Helpers Amazon2023 Python3.9 + display_name: Search Index Helpers RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 # Server tests - - name: test-amazon2023-python3.9-cov-no-c + - name: test-rhel8-python3.9-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2023 Python3.9 cov No C" + display_name: "* Test RHEL8 Python3.9 cov No C" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 tags: [coverage_tag] - - name: test-amazon2023-python3.9-cov + - name: test-rhel8-python3.9-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2023 Python3.9 cov" + display_name: "* Test RHEL8 Python3.9 cov" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 tags: [coverage_tag] - - name: test-amazon2023-python3.13-cov-no-c + - name: test-rhel8-python3.13-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2023 Python3.13 cov No C" + display_name: "* Test RHEL8 Python3.13 cov No C" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 tags: [coverage_tag] - - name: test-amazon2023-python3.13-cov + - name: test-rhel8-python3.13-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2023 Python3.13 cov" + display_name: "* Test RHEL8 Python3.13 cov" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 tags: [coverage_tag] - - name: test-amazon2023-pypy3.10-cov-no-c + - name: test-rhel8-pypy3.10-cov-no-c tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2023 PyPy3.10 cov No C" + display_name: "* Test RHEL8 PyPy3.10 cov No C" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage NO_EXT: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 tags: [coverage_tag] - - name: test-amazon2023-pypy3.10-cov + - name: test-rhel8-pypy3.10-cov tasks: - name: .standalone .sync_async - name: .replica_set .sync_async - name: .sharded_cluster .sync_async - display_name: "* Test Amazon2023 PyPy3.10 cov" + display_name: "* Test RHEL8 PyPy3.10 cov" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 tags: [coverage_tag] - - name: test-amazon2023-python3.10 + - name: test-rhel8-python3.10 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test Amazon2023 Python3.10" + display_name: "* Test RHEL8 Python3.10" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: test-amazon2023-python3.11 + PYTHON_BINARY: /opt/python/3.10/bin/python3 + - name: test-rhel8-python3.11 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test Amazon2023 Python3.11" + display_name: "* Test RHEL8 Python3.11" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: test-amazon2023-python3.12 + PYTHON_BINARY: /opt/python/3.11/bin/python3 + - name: test-rhel8-python3.12 tasks: - name: .sharded_cluster .auth .ssl .sync_async - name: .replica_set .noauth .ssl .sync_async - name: .standalone .noauth .nossl .sync_async - display_name: "* Test Amazon2023 Python3.12" + display_name: "* Test RHEL8 Python3.12" run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: COVERAGE: coverage - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.12/bin/python3 - name: test-macos-python3.9 tasks: - name: .sharded_cluster .auth .ssl !.sync_async @@ -1224,27 +1233,27 @@ buildvariants: PYTHON_BINARY: C:/python/32/Python313/python.exe # Serverless tests - - name: serverless-amazon2023-python3.9 + - name: serverless-rhel8-python3.9 tasks: - name: .serverless - display_name: Serverless Amazon2023 Python3.9 + display_name: Serverless RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: serverless-amazon2023-python3.13 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: serverless-rhel8-python3.13 tasks: - name: .serverless - display_name: Serverless Amazon2023 Python3.13 + display_name: Serverless RHEL8 Python3.13 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small batchtime: 10080 expansions: - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 # Stable api tests - - name: stable-api-require-v1-amazon2023-python3.9-auth + - name: stable-api-require-v1-rhel8-python3.9-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1252,16 +1261,16 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API require v1 Amazon2023 Python3.9 Auth + display_name: Stable API require v1 RHEL8 Python3.9 Auth run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: AUTH: auth REQUIRE_API_VERSION: "1" MONGODB_API_VERSION: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 tags: [versionedApi_tag] - - name: stable-api-accept-v2-amazon2023-python3.9-auth + - name: stable-api-accept-v2-rhel8-python3.9-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1269,15 +1278,15 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API accept v2 Amazon2023 Python3.9 Auth + display_name: Stable API accept v2 RHEL8 Python3.9 Auth run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: AUTH: auth ORCHESTRATION_FILE: versioned-api-testing.json - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 tags: [versionedApi_tag] - - name: stable-api-require-v1-amazon2023-python3.13-auth + - name: stable-api-require-v1-rhel8-python3.13-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1285,16 +1294,16 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API require v1 Amazon2023 Python3.13 Auth + display_name: Stable API require v1 RHEL8 Python3.13 Auth run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: AUTH: auth REQUIRE_API_VERSION: "1" MONGODB_API_VERSION: "1" - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 tags: [versionedApi_tag] - - name: stable-api-accept-v2-amazon2023-python3.13-auth + - name: stable-api-accept-v2-rhel8-python3.13-auth tasks: - name: .standalone .5.0 .noauth .nossl .sync_async - name: .standalone .6.0 .noauth .nossl .sync_async @@ -1302,17 +1311,17 @@ buildvariants: - name: .standalone .8.0 .noauth .nossl .sync_async - name: .standalone .rapid .noauth .nossl .sync_async - name: .standalone .latest .noauth .nossl .sync_async - display_name: Stable API accept v2 Amazon2023 Python3.13 Auth + display_name: Stable API accept v2 RHEL8 Python3.13 Auth run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: AUTH: auth ORCHESTRATION_FILE: versioned-api-testing.json - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.13/bin/python3 tags: [versionedApi_tag] # Storage engine tests - - name: storage-inmemory-amazon2023-python3.9 + - name: storage-inmemory-rhel8-python3.9 tasks: - name: .standalone .noauth .nossl .4.0 .sync_async - name: .standalone .noauth .nossl .4.2 .sync_async @@ -1323,19 +1332,19 @@ buildvariants: - name: .standalone .noauth .nossl .8.0 .sync_async - name: .standalone .noauth .nossl .rapid .sync_async - name: .standalone .noauth .nossl .latest .sync_async - display_name: Storage InMemory Amazon2023 Python3.9 + display_name: Storage InMemory RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: STORAGE_ENGINE: inmemory - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 - - name: storage-mmapv1-amazon2023-python3.9 + PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: storage-mmapv1-rhel8-python3.9 tasks: - name: .standalone .4.0 .noauth .nossl .sync_async - name: .replica_set .4.0 .noauth .nossl .sync_async - display_name: Storage MMAPv1 Amazon2023 Python3.9 + display_name: Storage MMAPv1 RHEL8 Python3.9 run_on: - - amazon2023-arm64-latest-large-m8g + - rhel87-small expansions: STORAGE_ENGINE: mmapv1 - PYTHON_BINARY: /opt/mongodbtoolchain/v4/bin/python3 + PYTHON_BINARY: /opt/python/3.9/bin/python3 diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index e81a10a29d..c78aebd839 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -70,14 +70,19 @@ class Host: HOSTS["ubuntu22"] = Host("ubuntu22", "ubuntu2204-small", "Ubuntu-22", dict()) HOSTS["rhel7"] = Host("rhel7", "rhel79-small", "RHEL7", dict()) HOSTS["perf"] = Host("perf", "rhel90-dbx-perf-large", "", dict()) -HOSTS["amazon2023"] = Host("amazon2023", "amazon2023-arm64-latest-large-m8g", "Amazon2023", dict()) DEFAULT_HOST = HOSTS["rhel8"] -DEFAULT_HOST = HOSTS["amazon2023"] # Other hosts -OTHER_HOSTS = ["RHEL9-FIPS", "RHEL8-zseries", "RHEL8-POWER8", "RHEL8-arm64"] +OTHER_HOSTS = ["RHEL9-FIPS", "RHEL8-zseries", "RHEL8-POWER8", "RHEL8-arm64", "Amazon2023"] for name, run_on in zip( - OTHER_HOSTS, ["rhel92-fips", "rhel8-zseries-small", "rhel8-power-small", "rhel82-arm64-small"] + OTHER_HOSTS, + [ + "rhel92-fips", + "rhel8-zseries-small", + "rhel8-power-small", + "rhel82-arm64-small", + "amazon2023-arm64-latest-large-m8g", + ], ): HOSTS[name] = Host(name, run_on, name, dict()) @@ -143,8 +148,6 @@ def create_variant( def get_python_binary(python: str, host: Host) -> str: """Get the appropriate python binary given a python version and host.""" name = host.name - if name == "amazon2023": - return "/opt/mongodbtoolchain/v4/bin/python3" if name in ["win64", "win32"]: if name == "win32": base = "C:/python/32" @@ -776,9 +779,12 @@ def create_alternative_hosts_variants(): handle_c_ext(C_EXTS[0], expansions) for host_name in OTHER_HOSTS: host = HOSTS[host_name] + tags = [".6.0 .standalone !.sync_async"] + if host_name == "amazon2023": + tags = [".latest !.sync_async"] variants.append( create_variant( - [".6.0 .standalone !.sync_async"], + tags, display_name=get_display_name("Other hosts", host), batchtime=batchtime, host=host, From d35198291f604ada691df6d333a5152cddef4530 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 24 Mar 2025 15:25:46 -0500 Subject: [PATCH 6/9] use latest --- .evergreen/generated_configs/variants.yml | 2 +- .evergreen/scripts/generate_config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index a4b2de40ba..c635f494d8 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -47,7 +47,7 @@ buildvariants: NO_EXT: "1" - name: other-hosts-amazon2023 tasks: - - name: .6.0 .standalone !.sync_async + - name: .latest !.sync_async display_name: Other hosts Amazon2023 run_on: - amazon2023-arm64-latest-large-m8g diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index c78aebd839..31e5f92fb8 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -780,7 +780,7 @@ def create_alternative_hosts_variants(): for host_name in OTHER_HOSTS: host = HOSTS[host_name] tags = [".6.0 .standalone !.sync_async"] - if host_name == "amazon2023": + if host_name == "Amazon2023": tags = [".latest !.sync_async"] variants.append( create_variant( From 6c0a69fa994b2fc0976772032ed8e3e426da218f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 24 Mar 2025 15:26:34 -0500 Subject: [PATCH 7/9] use subtasks --- .evergreen/scripts/generate_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 31e5f92fb8..f328e2215e 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -781,7 +781,7 @@ def create_alternative_hosts_variants(): host = HOSTS[host_name] tags = [".6.0 .standalone !.sync_async"] if host_name == "Amazon2023": - tags = [".latest !.sync_async"] + tags = [".latest !.sync_async .{t}" for t in SUB_TASKS] variants.append( create_variant( tags, From 3c41750d5b55046f56aa768548985f58cdffae5b Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 24 Mar 2025 15:27:39 -0500 Subject: [PATCH 8/9] use subtasks --- .evergreen/generated_configs/variants.yml | 4 +++- .evergreen/scripts/generate_config.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index c635f494d8..53e178bd19 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -47,7 +47,9 @@ buildvariants: NO_EXT: "1" - name: other-hosts-amazon2023 tasks: - - name: .latest !.sync_async + - name: .latest !.sync_async .sharded_cluster .auth .ssl + - name: .latest !.sync_async .replica_set .noauth .ssl + - name: .latest !.sync_async .standalone .noauth .nossl display_name: Other hosts Amazon2023 run_on: - amazon2023-arm64-latest-large-m8g diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index f328e2215e..50c81a5840 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -781,7 +781,7 @@ def create_alternative_hosts_variants(): host = HOSTS[host_name] tags = [".6.0 .standalone !.sync_async"] if host_name == "Amazon2023": - tags = [".latest !.sync_async .{t}" for t in SUB_TASKS] + tags = [f".latest !.sync_async {t}" for t in SUB_TASKS] variants.append( create_variant( tags, From 8b5c7204886606dcc53cca6087efaf54e4762684 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 24 Mar 2025 15:28:24 -0500 Subject: [PATCH 9/9] use upstream --- .evergreen/scripts/configure-env.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh index 918285f52f..9ec98bb5be 100755 --- a/.evergreen/scripts/configure-env.sh +++ b/.evergreen/scripts/configure-env.sh @@ -76,8 +76,6 @@ EOT rm -rf $DRIVERS_TOOLS BRANCH=master ORG=mongodb-labs -ORG=blink1073 -BRANCH=test-rhel-arm git clone --branch $BRANCH https://github.com/$ORG/drivers-evergreen-tools.git $DRIVERS_TOOLS cat < ${DRIVERS_TOOLS}/.env