Skip to content

Commit cb4a70b

Browse files
committed
PYTHON-5196 Convert OIDC tests to use new test scripts
1 parent b3885fa commit cb4a70b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.evergreen/generated_configs/variants.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -920,24 +920,21 @@ buildvariants:
920920
# Oidc auth tests
921921
- name: auth-oidc-ubuntu-22
922922
tasks:
923-
- name: testoidc_task_group
924-
- name: testazureoidc_task_group
925-
- name: testgcpoidc_task_group
926-
- name: testk8soidc_task_group
923+
- name: .auth_oidc
927924
display_name: Auth OIDC Ubuntu-22
928925
run_on:
929926
- ubuntu2204-small
930927
batchtime: 10080
931928
- name: auth-oidc-macos
932929
tasks:
933-
- name: testoidc_task_group
930+
- name: .auth_oidc !.auth_oidc_remote
934931
display_name: Auth OIDC macOS
935932
run_on:
936933
- macos-14
937934
batchtime: 10080
938935
- name: auth-oidc-win64
939936
tasks:
940-
- name: testoidc_task_group
937+
- name: .auth_oidc !.auth_oidc_remote
941938
display_name: Auth OIDC Win64
942939
run_on:
943940
- windows-64-vsMulti-small

.evergreen/scripts/generate_config.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -663,11 +663,11 @@ def create_serverless_variants():
663663

664664
def create_oidc_auth_variants():
665665
variants = []
666-
other_tasks = ["testazureoidc_task_group", "testgcpoidc_task_group", "testk8soidc_task_group"]
667666
for host_name in ["ubuntu22", "macos", "win64"]:
668-
tasks = ["testoidc_task_group"]
669667
if host_name == "ubuntu22":
670-
tasks += other_tasks
668+
tasks = [".auth_oidc"]
669+
else:
670+
tasks = [".auth_oidc !.auth_oidc_remote"]
671671
host = HOSTS[host_name]
672672
variants.append(
673673
create_variant(
@@ -890,7 +890,10 @@ def create_oidc_tasks():
890890
vars = dict(TEST_NAME="auth_oidc", SUB_TEST_NAME=sub_test)
891891
test_func = FunctionCall(func="run tests", vars=vars)
892892
task_name = f"test-auth-oidc-{sub_test}"
893-
tasks.append(EvgTask(name=task_name, tags=["oidc"], commands=[test_func]))
893+
tags = ["auth_oidc"]
894+
if sub_test != "test":
895+
tags.append("auth_oidc_remote")
896+
tasks.append(EvgTask(name=task_name, tags=tags, commands=[test_func]))
894897
tasks.append([])
895898

896899

0 commit comments

Comments
 (0)