From c75c8ee1791c4c143cd58eb750dc51402759ae95 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 25 Mar 2025 14:52:56 -0500 Subject: [PATCH 1/2] PYTHON-5236 Test sharded clusters with requireApiVersion=1 --- .evergreen/generated_configs/variants.yml | 48 +++++++++++------------ .evergreen/scripts/generate_config.py | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 53e178bd19..dd66b48f58 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -1257,12 +1257,12 @@ buildvariants: # Stable api tests - 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 - - name: .standalone .7.0 .noauth .nossl .sync_async - - name: .standalone .8.0 .noauth .nossl .sync_async - - name: .standalone .rapid .noauth .nossl .sync_async - - name: .standalone .latest .noauth .nossl .sync_async + - name: "!.replica_set .5.0 .noauth .nossl .sync_async" + - name: "!.replica_set .6.0 .noauth .nossl .sync_async" + - name: "!.replica_set .7.0 .noauth .nossl .sync_async" + - name: "!.replica_set .8.0 .noauth .nossl .sync_async" + - name: "!.replica_set .rapid .noauth .nossl .sync_async" + - name: "!.replica_set .latest .noauth .nossl .sync_async" display_name: Stable API require v1 RHEL8 Python3.9 Auth run_on: - rhel87-small @@ -1274,12 +1274,12 @@ buildvariants: tags: [versionedApi_tag] - 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 - - name: .standalone .7.0 .noauth .nossl .sync_async - - name: .standalone .8.0 .noauth .nossl .sync_async - - name: .standalone .rapid .noauth .nossl .sync_async - - name: .standalone .latest .noauth .nossl .sync_async + - name: "!.replica_set .5.0 .noauth .nossl .sync_async" + - name: "!.replica_set .6.0 .noauth .nossl .sync_async" + - name: "!.replica_set .7.0 .noauth .nossl .sync_async" + - name: "!.replica_set .8.0 .noauth .nossl .sync_async" + - name: "!.replica_set .rapid .noauth .nossl .sync_async" + - name: "!.replica_set .latest .noauth .nossl .sync_async" display_name: Stable API accept v2 RHEL8 Python3.9 Auth run_on: - rhel87-small @@ -1290,12 +1290,12 @@ buildvariants: tags: [versionedApi_tag] - 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 - - name: .standalone .7.0 .noauth .nossl .sync_async - - name: .standalone .8.0 .noauth .nossl .sync_async - - name: .standalone .rapid .noauth .nossl .sync_async - - name: .standalone .latest .noauth .nossl .sync_async + - name: "!.replica_set .5.0 .noauth .nossl .sync_async" + - name: "!.replica_set .6.0 .noauth .nossl .sync_async" + - name: "!.replica_set .7.0 .noauth .nossl .sync_async" + - name: "!.replica_set .8.0 .noauth .nossl .sync_async" + - name: "!.replica_set .rapid .noauth .nossl .sync_async" + - name: "!.replica_set .latest .noauth .nossl .sync_async" display_name: Stable API require v1 RHEL8 Python3.13 Auth run_on: - rhel87-small @@ -1307,12 +1307,12 @@ buildvariants: tags: [versionedApi_tag] - 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 - - name: .standalone .7.0 .noauth .nossl .sync_async - - name: .standalone .8.0 .noauth .nossl .sync_async - - name: .standalone .rapid .noauth .nossl .sync_async - - name: .standalone .latest .noauth .nossl .sync_async + - name: "!.replica_set .5.0 .noauth .nossl .sync_async" + - name: "!.replica_set .6.0 .noauth .nossl .sync_async" + - name: "!.replica_set .7.0 .noauth .nossl .sync_async" + - name: "!.replica_set .8.0 .noauth .nossl .sync_async" + - name: "!.replica_set .rapid .noauth .nossl .sync_async" + - name: "!.replica_set .latest .noauth .nossl .sync_async" display_name: Stable API accept v2 RHEL8 Python3.13 Auth run_on: - rhel87-small diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index 50c81a5840..f0afb31cf3 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -546,7 +546,7 @@ def create_storage_engine_variants(): def create_stable_api_variants(): host = DEFAULT_HOST tags = ["versionedApi_tag"] - tasks = [f".standalone .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")] + tasks = [f"!.replica_set .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")] variants = [] types = ["require v1", "accept v2"] From ad678a41fb9b7323627c9dc64abc3eb16c581239 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 25 Mar 2025 15:03:06 -0500 Subject: [PATCH 2/2] update variants --- .evergreen/generated_configs/variants.yml | 24 +++++++++++------------ .evergreen/scripts/generate_config.py | 7 ++++++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index dd66b48f58..ca8c0e1966 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -1274,12 +1274,12 @@ buildvariants: tags: [versionedApi_tag] - name: stable-api-accept-v2-rhel8-python3.9-auth tasks: - - name: "!.replica_set .5.0 .noauth .nossl .sync_async" - - name: "!.replica_set .6.0 .noauth .nossl .sync_async" - - name: "!.replica_set .7.0 .noauth .nossl .sync_async" - - name: "!.replica_set .8.0 .noauth .nossl .sync_async" - - name: "!.replica_set .rapid .noauth .nossl .sync_async" - - name: "!.replica_set .latest .noauth .nossl .sync_async" + - name: .standalone .5.0 .noauth .nossl .sync_async + - name: .standalone .6.0 .noauth .nossl .sync_async + - name: .standalone .7.0 .noauth .nossl .sync_async + - 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 run_on: - rhel87-small @@ -1307,12 +1307,12 @@ buildvariants: tags: [versionedApi_tag] - name: stable-api-accept-v2-rhel8-python3.13-auth tasks: - - name: "!.replica_set .5.0 .noauth .nossl .sync_async" - - name: "!.replica_set .6.0 .noauth .nossl .sync_async" - - name: "!.replica_set .7.0 .noauth .nossl .sync_async" - - name: "!.replica_set .8.0 .noauth .nossl .sync_async" - - name: "!.replica_set .rapid .noauth .nossl .sync_async" - - name: "!.replica_set .latest .noauth .nossl .sync_async" + - name: .standalone .5.0 .noauth .nossl .sync_async + - name: .standalone .6.0 .noauth .nossl .sync_async + - name: .standalone .7.0 .noauth .nossl .sync_async + - 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 run_on: - rhel87-small diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py index f0afb31cf3..54d5e4efe8 100644 --- a/.evergreen/scripts/generate_config.py +++ b/.evergreen/scripts/generate_config.py @@ -546,7 +546,6 @@ def create_storage_engine_variants(): def create_stable_api_variants(): host = DEFAULT_HOST tags = ["versionedApi_tag"] - tasks = [f"!.replica_set .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")] variants = [] types = ["require v1", "accept v2"] @@ -560,11 +559,17 @@ def create_stable_api_variants(): expansions["REQUIRE_API_VERSION"] = "1" # MONGODB_API_VERSION is the apiVersion to use in the test suite. expansions["MONGODB_API_VERSION"] = "1" + tasks = [ + f"!.replica_set .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0") + ] else: # Test against a cluster with acceptApiVersion2 but without # requireApiVersion, and don't automatically add apiVersion to # clients created in the test suite. expansions["ORCHESTRATION_FILE"] = "versioned-api-testing.json" + tasks = [ + f".standalone .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0") + ] base_display_name = f"Stable API {test_type}" display_name = get_display_name(base_display_name, host, python=python, **expansions) variant = create_variant(