diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index c666c6901a..37b7a622d5 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -227,6 +227,186 @@ tasks: - noauth - nossl - sync_async + - name: test-4.2-standalone-auth-ssl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - standalone + - auth + - ssl + - sync + - name: test-4.2-standalone-auth-ssl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - standalone + - auth + - ssl + - async + - name: test-4.2-standalone-auth-ssl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - standalone + - auth + - ssl + - sync_async + - name: test-4.2-standalone-noauth-ssl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - standalone + - noauth + - ssl + - sync + - name: test-4.2-standalone-noauth-ssl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - standalone + - noauth + - ssl + - async + - name: test-4.2-standalone-noauth-ssl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - standalone + - noauth + - ssl + - sync_async + - name: test-4.2-standalone-noauth-nossl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - standalone + - noauth + - nossl + - sync + - name: test-4.2-standalone-noauth-nossl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - standalone + - noauth + - nossl + - async + - name: test-4.2-standalone-noauth-nossl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: server + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - standalone + - noauth + - nossl + - sync_async - name: test-4.4-standalone-auth-ssl-sync commands: - func: bootstrap mongo-orchestration @@ -1667,6 +1847,186 @@ tasks: - noauth - nossl - sync_async + - name: test-4.2-replica_set-auth-ssl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - replica_set + - auth + - ssl + - sync + - name: test-4.2-replica_set-auth-ssl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - replica_set + - auth + - ssl + - async + - name: test-4.2-replica_set-auth-ssl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - replica_set + - auth + - ssl + - sync_async + - name: test-4.2-replica_set-noauth-ssl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - replica_set + - noauth + - ssl + - sync + - name: test-4.2-replica_set-noauth-ssl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - replica_set + - noauth + - ssl + - async + - name: test-4.2-replica_set-noauth-ssl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - replica_set + - noauth + - ssl + - sync_async + - name: test-4.2-replica_set-noauth-nossl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - replica_set + - noauth + - nossl + - sync + - name: test-4.2-replica_set-noauth-nossl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - replica_set + - noauth + - nossl + - async + - name: test-4.2-replica_set-noauth-nossl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: replica_set + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - replica_set + - noauth + - nossl + - sync_async - name: test-4.4-replica_set-auth-ssl-sync commands: - func: bootstrap mongo-orchestration @@ -3107,6 +3467,186 @@ tasks: - noauth - nossl - sync_async + - name: test-4.2-sharded_cluster-auth-ssl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - sharded_cluster + - auth + - ssl + - sync + - name: test-4.2-sharded_cluster-auth-ssl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - sharded_cluster + - auth + - ssl + - async + - name: test-4.2-sharded_cluster-auth-ssl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: auth + SSL: ssl + - func: run tests + vars: + AUTH: auth + SSL: ssl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - sharded_cluster + - auth + - ssl + - sync_async + - name: test-4.2-sharded_cluster-noauth-ssl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - sharded_cluster + - noauth + - ssl + - sync + - name: test-4.2-sharded_cluster-noauth-ssl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - sharded_cluster + - noauth + - ssl + - async + - name: test-4.2-sharded_cluster-noauth-ssl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: noauth + SSL: ssl + - func: run tests + vars: + AUTH: noauth + SSL: ssl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - sharded_cluster + - noauth + - ssl + - sync_async + - name: test-4.2-sharded_cluster-noauth-nossl-sync + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: sync + TEST_SUITES: default + tags: + - "4.2" + - sharded_cluster + - noauth + - nossl + - sync + - name: test-4.2-sharded_cluster-noauth-nossl-async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: async + TEST_SUITES: default_async + tags: + - "4.2" + - sharded_cluster + - noauth + - nossl + - async + - name: test-4.2-sharded_cluster-noauth-nossl-sync_async + commands: + - func: bootstrap mongo-orchestration + vars: + VERSION: "4.2" + TOPOLOGY: sharded_cluster + AUTH: noauth + SSL: nossl + - func: run tests + vars: + AUTH: noauth + SSL: nossl + SYNC: sync_async + TEST_SUITES: "" + tags: + - "4.2" + - sharded_cluster + - noauth + - nossl + - sync_async - name: test-4.4-sharded_cluster-auth-ssl-sync commands: - func: bootstrap mongo-orchestration diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 79c9b22c93..8f5d833e90 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -817,10 +817,10 @@ buildvariants: PYTHON_BINARY: /opt/python/3.13/bin/python3 # Ocsp tests - - name: ocsp-rhel8-v4.4-python3.9 + - name: ocsp-rhel8-v4.2-python3.9 tasks: - name: .ocsp - display_name: OCSP RHEL8 v4.4 Python3.9 + display_name: OCSP RHEL8 v4.2 Python3.9 run_on: - rhel87-small batchtime: 20160 @@ -828,12 +828,12 @@ buildvariants: AUTH: noauth SSL: ssl TOPOLOGY: server - VERSION: "4.4" + VERSION: "4.2" PYTHON_BINARY: /opt/python/3.9/bin/python3 - - name: ocsp-rhel8-v5.0-python3.10 + - name: ocsp-rhel8-v4.4-python3.10 tasks: - name: .ocsp - display_name: OCSP RHEL8 v5.0 Python3.10 + display_name: OCSP RHEL8 v4.4 Python3.10 run_on: - rhel87-small batchtime: 20160 @@ -841,12 +841,12 @@ buildvariants: AUTH: noauth SSL: ssl TOPOLOGY: server - VERSION: "5.0" + VERSION: "4.4" PYTHON_BINARY: /opt/python/3.10/bin/python3 - - name: ocsp-rhel8-v6.0-python3.11 + - name: ocsp-rhel8-v5.0-python3.11 tasks: - name: .ocsp - display_name: OCSP RHEL8 v6.0 Python3.11 + display_name: OCSP RHEL8 v5.0 Python3.11 run_on: - rhel87-small batchtime: 20160 @@ -854,12 +854,12 @@ buildvariants: AUTH: noauth SSL: ssl TOPOLOGY: server - VERSION: "6.0" + VERSION: "5.0" PYTHON_BINARY: /opt/python/3.11/bin/python3 - - name: ocsp-rhel8-v7.0-python3.12 + - name: ocsp-rhel8-v6.0-python3.12 tasks: - name: .ocsp - display_name: OCSP RHEL8 v7.0 Python3.12 + display_name: OCSP RHEL8 v6.0 Python3.12 run_on: - rhel87-small batchtime: 20160 @@ -867,12 +867,12 @@ buildvariants: AUTH: noauth SSL: ssl TOPOLOGY: server - VERSION: "7.0" + VERSION: "6.0" PYTHON_BINARY: /opt/python/3.12/bin/python3 - - name: ocsp-rhel8-v8.0-python3.13 + - name: ocsp-rhel8-v7.0-python3.13 tasks: - name: .ocsp - display_name: OCSP RHEL8 v8.0 Python3.13 + display_name: OCSP RHEL8 v7.0 Python3.13 run_on: - rhel87-small batchtime: 20160 @@ -880,12 +880,12 @@ buildvariants: AUTH: noauth SSL: ssl TOPOLOGY: server - VERSION: "8.0" + VERSION: "7.0" PYTHON_BINARY: /opt/python/3.13/bin/python3 - - name: ocsp-rhel8-rapid-pypy3.10 + - name: ocsp-rhel8-v8.0-pypy3.10 tasks: - name: .ocsp - display_name: OCSP RHEL8 rapid PyPy3.10 + display_name: OCSP RHEL8 v8.0 PyPy3.10 run_on: - rhel87-small batchtime: 20160 @@ -893,12 +893,12 @@ buildvariants: AUTH: noauth SSL: ssl TOPOLOGY: server - VERSION: rapid + VERSION: "8.0" PYTHON_BINARY: /opt/python/pypy3.10/bin/python3 - - name: ocsp-rhel8-latest-python3.9 + - name: ocsp-rhel8-rapid-python3.9 tasks: - name: .ocsp - display_name: OCSP RHEL8 latest Python3.9 + display_name: OCSP RHEL8 rapid Python3.9 run_on: - rhel87-small batchtime: 20160 @@ -906,8 +906,21 @@ buildvariants: AUTH: noauth SSL: ssl TOPOLOGY: server - VERSION: latest + VERSION: rapid PYTHON_BINARY: /opt/python/3.9/bin/python3 + - name: ocsp-rhel8-latest-python3.10 + tasks: + - name: .ocsp + display_name: OCSP RHEL8 latest Python3.10 + run_on: + - rhel87-small + batchtime: 20160 + expansions: + AUTH: noauth + SSL: ssl + TOPOLOGY: server + VERSION: latest + PYTHON_BINARY: /opt/python/3.10/bin/python3 - name: ocsp-win64-v4.4-python3.9 tasks: - name: .ocsp-rsa !.ocsp-staple @@ -1338,6 +1351,7 @@ buildvariants: - name: storage-inmemory-rhel8-python3.9 tasks: - name: .standalone .noauth .nossl .4.0 .sync_async + - name: .standalone .noauth .nossl .4.2 .sync_async - name: .standalone .noauth .nossl .4.4 .sync_async - name: .standalone .noauth .nossl .5.0 .sync_async - name: .standalone .noauth .nossl .6.0 .sync_async diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index e9624ab109..41b1266a70 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -26,7 +26,7 @@ # Globals ############## -ALL_VERSIONS = ["4.0", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"] +ALL_VERSIONS = ["4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"] CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"] PYPYS = ["pypy3.10"] ALL_PYTHONS = CPYTHONS + PYPYS diff --git a/uv.lock b/uv.lock index e7f09f66fc..a2e951e76c 100644 --- a/uv.lock +++ b/uv.lock @@ -997,7 +997,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/07/e9/ae44ea7d7605df9e5 [[package]] name = "pymongo" -version = "4.11.0.dev0" +version = "4.12.0.dev0" source = { editable = "." } dependencies = [ { name = "dnspython" },