Skip to content

Commit cdd0f04

Browse files
committed
fix oidc handling
1 parent 3a7c2cb commit cdd0f04

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

.evergreen/generated_configs/tasks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2245,7 +2245,7 @@ tasks:
22452245
vars:
22462246
TEST_NAME: auth_oidc
22472247
SUB_TEST_NAME: default
2248-
tags: [auth_oidc, pr]
2248+
tags: [auth_oidc]
22492249
- name: test-auth-oidc-azure
22502250
commands:
22512251
- func: run tests

.evergreen/generated_configs/variants.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -435,21 +435,29 @@ buildvariants:
435435
# Oidc auth tests
436436
- name: auth-oidc-ubuntu-22
437437
tasks:
438-
- name: .auth_oidc
438+
- name: .auth_oidc_remote
439439
display_name: Auth OIDC Ubuntu-22
440440
run_on:
441441
- ubuntu2204-small
442442
batchtime: 10080
443+
- name: auth-oidc-local-ubuntu-22
444+
tasks:
445+
- name: .auth_oidc_remote
446+
display_name: Auth OIDC Local Ubuntu-22
447+
run_on:
448+
- ubuntu2204-small
449+
batchtime: 10080
450+
tags: [pr]
443451
- name: auth-oidc-macos
444452
tasks:
445-
- name: .auth_oidc !.auth_oidc_remote !.pr
453+
- name: "!.auth_oidc_remote"
446454
display_name: Auth OIDC macOS
447455
run_on:
448456
- macos-14
449457
batchtime: 10080
450458
- name: auth-oidc-win64
451459
tasks:
452-
- name: .auth_oidc !.auth_oidc_remote !.pr
460+
- name: "!.auth_oidc_remote"
453461
display_name: Auth OIDC Win64
454462
run_on:
455463
- windows-64-vsMulti-small

.evergreen/scripts/generate_config.py

+14-4
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ def create_oidc_auth_variants():
373373
variants = []
374374
for host_name in ["ubuntu22", "macos", "win64"]:
375375
if host_name == "ubuntu22":
376-
tasks = [".auth_oidc"]
376+
tasks = [".auth_oidc_remote"]
377377
else:
378-
tasks = [".auth_oidc !.auth_oidc_remote !.pr"]
378+
tasks = ["!.auth_oidc_remote"]
379379
host = HOSTS[host_name]
380380
variants.append(
381381
create_variant(
@@ -385,6 +385,17 @@ def create_oidc_auth_variants():
385385
batchtime=BATCHTIME_WEEK,
386386
)
387387
)
388+
# Add a specific local test to run on PRs.
389+
if host_name == "ubuntu22":
390+
variants.append(
391+
create_variant(
392+
tasks,
393+
get_variant_name("Auth OIDC Local", host),
394+
tags=["pr"],
395+
host=host,
396+
batchtime=BATCHTIME_WEEK,
397+
)
398+
)
388399
return variants
389400

390401

@@ -764,9 +775,8 @@ def create_oidc_tasks():
764775
tags = ["auth_oidc"]
765776
if sub_test != "default":
766777
tags.append("auth_oidc_remote")
767-
else:
768-
tags.append("pr")
769778
tasks.append(EvgTask(name=task_name, tags=tags, commands=[test_func]))
779+
770780
return tasks
771781

772782

0 commit comments

Comments
 (0)