Skip to content

Commit 4a1b720

Browse files
committed
fix variants
1 parent 1d74cfc commit 4a1b720

File tree

2 files changed

+7
-44
lines changed

2 files changed

+7
-44
lines changed

.evergreen/generated_configs/variants.yml

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -884,71 +884,36 @@ buildvariants:
884884
PYTHON_BINARY: /opt/python/3.13/bin/python3
885885

886886
# Stable api tests
887-
- name: stable-api-require-v1-rhel8-python3.9-auth
887+
- name: stable-api-require-v1-rhel8-auth
888888
tasks:
889889
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
890890
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
891891
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
892892
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
893893
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
894894
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
895-
display_name: Stable API require v1 RHEL8 Python3.9 Auth
895+
display_name: Stable API require v1 RHEL8 Auth
896896
run_on:
897897
- rhel87-small
898898
expansions:
899899
AUTH: auth
900900
REQUIRE_API_VERSION: "1"
901901
MONGODB_API_VERSION: "1"
902-
PYTHON_BINARY: /opt/python/3.9/bin/python3
903902
tags: [versionedApi_tag]
904-
- name: stable-api-accept-v2-rhel8-python3.9-auth
903+
- name: stable-api-accept-v2-rhel8-auth
905904
tasks:
906905
- name: .standard-linux .server-5.0
907906
- name: .standard-linux .server-6.0
908907
- name: .standard-linux .server-7.0
909908
- name: .standard-linux .server-8.0
910909
- name: .standard-linux .server-rapid
911910
- name: .standard-linux .server-latest
912-
display_name: Stable API accept v2 RHEL8 Python3.9 Auth
911+
display_name: Stable API accept v2 RHEL8 Auth
913912
run_on:
914913
- rhel87-small
915914
expansions:
916915
AUTH: auth
917916
ORCHESTRATION_FILE: versioned-api-testing.json
918-
PYTHON_BINARY: /opt/python/3.9/bin/python3
919-
tags: [versionedApi_tag]
920-
- name: stable-api-require-v1-rhel8-python3.13-auth
921-
tasks:
922-
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
923-
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
924-
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
925-
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
926-
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
927-
- name: .standard-linux !.replica_set-noauth-ssl .server-{v}
928-
display_name: Stable API require v1 RHEL8 Python3.13 Auth
929-
run_on:
930-
- rhel87-small
931-
expansions:
932-
AUTH: auth
933-
REQUIRE_API_VERSION: "1"
934-
MONGODB_API_VERSION: "1"
935-
PYTHON_BINARY: /opt/python/3.13/bin/python3
936-
tags: [versionedApi_tag]
937-
- name: stable-api-accept-v2-rhel8-python3.13-auth
938-
tasks:
939-
- name: .standard-linux .server-5.0
940-
- name: .standard-linux .server-6.0
941-
- name: .standard-linux .server-7.0
942-
- name: .standard-linux .server-8.0
943-
- name: .standard-linux .server-rapid
944-
- name: .standard-linux .server-latest
945-
display_name: Stable API accept v2 RHEL8 Python3.13 Auth
946-
run_on:
947-
- rhel87-small
948-
expansions:
949-
AUTH: auth
950-
ORCHESTRATION_FILE: versioned-api-testing.json
951-
PYTHON_BINARY: /opt/python/3.13/bin/python3
952917
tags: [versionedApi_tag]
953918

954919
# Standard nonlinux tests

.evergreen/scripts/generate_config.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def create_stable_api_variants():
308308
types = ["require v1", "accept v2"]
309309

310310
# All python versions across platforms.
311-
for python, test_type in product(MIN_MAX_PYTHON, types):
311+
for test_type in types:
312312
expansions = dict(AUTH="auth")
313313
# Test against a cluster with requireApiVersion=1.
314314
if test_type == types[0]:
@@ -328,10 +328,8 @@ def create_stable_api_variants():
328328
expansions["ORCHESTRATION_FILE"] = "versioned-api-testing.json"
329329
tasks = [f".standard-linux .server-{v}" for v in get_versions_from("5.0")]
330330
base_display_name = f"Stable API {test_type}"
331-
display_name = get_variant_name(base_display_name, host, python=python, **expansions)
332-
variant = create_variant(
333-
tasks, display_name, host=host, python=python, tags=tags, expansions=expansions
334-
)
331+
display_name = get_variant_name(base_display_name, host, **expansions)
332+
variant = create_variant(tasks, display_name, host=host, tags=tags, expansions=expansions)
335333
variants.append(variant)
336334

337335
return variants

0 commit comments

Comments
 (0)