Skip to content

Commit 3a7c2cb

Browse files
committed
PYTHON-5379 Run more variants on pull requests
1 parent 2655bb4 commit 3a7c2cb

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

.evergreen/generated_configs/tasks.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,26 +178,30 @@ tasks:
178178
vars:
179179
TEST_NAME: kms
180180
SUB_TEST_NAME: gcp
181+
tags: []
181182
- name: test-gcpkms-fail
182183
commands:
183184
- func: run server
184185
- func: run tests
185186
vars:
186187
TEST_NAME: kms
187188
SUB_TEST_NAME: gcp-fail
189+
tags: [pr]
188190
- name: test-azurekms
189191
commands:
190192
- func: run tests
191193
vars:
192194
TEST_NAME: kms
193195
SUB_TEST_NAME: azure
196+
tags: []
194197
- name: test-azurekms-fail
195198
commands:
196199
- func: run server
197200
- func: run tests
198201
vars:
199202
TEST_NAME: kms
200203
SUB_TEST_NAME: azure-fail
204+
tags: [pr]
201205

202206
# Mod wsgi tests
203207
- name: mod-wsgi-replica-set-python3.9
@@ -2241,7 +2245,7 @@ tasks:
22412245
vars:
22422246
TEST_NAME: auth_oidc
22432247
SUB_TEST_NAME: default
2244-
tags: [auth_oidc]
2248+
tags: [auth_oidc, pr]
22452249
- name: test-auth-oidc-azure
22462250
commands:
22472251
- func: run tests

.evergreen/generated_configs/variants.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ buildvariants:
2222
VERSION: latest
2323
NO_EXT: "1"
2424
REQUIRE_FIPS: "1"
25+
tags: []
2526
- name: other-hosts-rhel8-zseries-latest
2627
tasks:
2728
- name: .test-no-toolchain
@@ -32,6 +33,7 @@ buildvariants:
3233
expansions:
3334
VERSION: latest
3435
NO_EXT: "1"
36+
tags: []
3537
- name: other-hosts-rhel8-power8-latest
3638
tasks:
3739
- name: .test-no-toolchain
@@ -42,6 +44,7 @@ buildvariants:
4244
expansions:
4345
VERSION: latest
4446
NO_EXT: "1"
47+
tags: []
4548
- name: other-hosts-rhel8-arm64-latest
4649
tasks:
4750
- name: .test-no-toolchain
@@ -52,6 +55,7 @@ buildvariants:
5255
expansions:
5356
VERSION: latest
5457
NO_EXT: "1"
58+
tags: []
5559
- name: other-hosts-amazon2023-latest
5660
tasks:
5761
- name: .test-no-toolchain
@@ -62,6 +66,7 @@ buildvariants:
6266
expansions:
6367
VERSION: latest
6468
NO_EXT: "1"
69+
tags: [pr]
6570

6671
# Atlas connect tests
6772
- name: atlas-connect-rhel8
@@ -288,6 +293,7 @@ buildvariants:
288293
- rhel87-small
289294
expansions:
290295
PYTHON_BINARY: /opt/python/3.13t/bin/python3
296+
tags: [pr]
291297
- name: free-threaded-macos-python3.13t
292298
tasks:
293299
- name: .free-threading
@@ -296,6 +302,7 @@ buildvariants:
296302
- macos-14
297303
expansions:
298304
PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.13/bin/python3t
305+
tags: []
299306
- name: free-threaded-macos-arm64-python3.13t
300307
tasks:
301308
- name: .free-threading
@@ -304,6 +311,7 @@ buildvariants:
304311
- macos-14-arm64
305312
expansions:
306313
PYTHON_BINARY: /Library/Frameworks/PythonT.Framework/Versions/3.13/bin/python3t
314+
tags: []
307315

308316
# Green framework tests
309317
- name: green-eventlet-rhel8
@@ -434,14 +442,14 @@ buildvariants:
434442
batchtime: 10080
435443
- name: auth-oidc-macos
436444
tasks:
437-
- name: .auth_oidc !.auth_oidc_remote
445+
- name: .auth_oidc !.auth_oidc_remote !.pr
438446
display_name: Auth OIDC macOS
439447
run_on:
440448
- macos-14
441449
batchtime: 10080
442450
- name: auth-oidc-win64
443451
tasks:
444-
- name: .auth_oidc !.auth_oidc_remote
452+
- name: .auth_oidc !.auth_oidc_remote !.pr
445453
display_name: Auth OIDC Win64
446454
run_on:
447455
- windows-64-vsMulti-small

.evergreen/scripts/generate_config.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,13 @@ def create_free_threaded_variants() -> list[BuildVariant]:
112112
# TODO: PYTHON-5027
113113
continue
114114
tasks = [".free-threading"]
115+
tags = []
116+
if host_name == "rhel8":
117+
tags.append("pr")
115118
host = HOSTS[host_name]
116119
python = "3.13t"
117120
display_name = get_variant_name("Free-threaded", host, python=python)
118-
variant = create_variant(tasks, display_name, python=python, host=host)
121+
variant = create_variant(tasks, display_name, tags=tags, python=python, host=host)
119122
variants.append(variant)
120123
return variants
121124

@@ -372,7 +375,7 @@ def create_oidc_auth_variants():
372375
if host_name == "ubuntu22":
373376
tasks = [".auth_oidc"]
374377
else:
375-
tasks = [".auth_oidc !.auth_oidc_remote"]
378+
tasks = [".auth_oidc !.auth_oidc_remote !.pr"]
376379
host = HOSTS[host_name]
377380
variants.append(
378381
create_variant(
@@ -512,14 +515,18 @@ def create_alternative_hosts_variants():
512515
expansions = dict(VERSION="latest")
513516
handle_c_ext(C_EXTS[0], expansions)
514517
host = HOSTS[host_name]
518+
tags = []
515519
if "fips" in host_name.lower():
516520
expansions["REQUIRE_FIPS"] = "1"
521+
if "amazon" in host_name.lower():
522+
tags.append("pr")
517523
variants.append(
518524
create_variant(
519525
[".test-no-toolchain"],
520526
display_name=get_variant_name("Other hosts", host, version=version),
521527
batchtime=batchtime,
522528
host=host,
529+
tags=tags,
523530
expansions=expansions,
524531
)
525532
)
@@ -693,16 +700,18 @@ def create_kms_tasks():
693700
for success in [True, False]:
694701
name = f"test-{kms_type}kms"
695702
sub_test_name = kms_type
703+
tags = []
696704
if not success:
697705
name += "-fail"
698706
sub_test_name += "-fail"
707+
tags.append("pr")
699708
commands = []
700709
if not success:
701710
commands.append(FunctionCall(func="run server"))
702711
test_vars = dict(TEST_NAME="kms", SUB_TEST_NAME=sub_test_name)
703712
test_func = FunctionCall(func="run tests", vars=test_vars)
704713
commands.append(test_func)
705-
tasks.append(EvgTask(name=name, commands=commands))
714+
tasks.append(EvgTask(name=name, tags=tags, commands=commands))
706715
return tasks
707716

708717

@@ -755,6 +764,8 @@ def create_oidc_tasks():
755764
tags = ["auth_oidc"]
756765
if sub_test != "default":
757766
tags.append("auth_oidc_remote")
767+
else:
768+
tags.append("pr")
758769
tasks.append(EvgTask(name=task_name, tags=tags, commands=[test_func]))
759770
return tasks
760771

@@ -802,6 +813,8 @@ def _create_ocsp_tasks(algo, variant, server_type, base_task_name):
802813
tags = ["ocsp", f"ocsp-{algo}", version]
803814
if "disableStapling" not in variant:
804815
tags.append("ocsp-staple")
816+
if algo == "valid-cert-server-staples" and version == "latest":
817+
tags.append("pr")
805818

806819
task_name = get_task_name(
807820
f"test-ocsp-{algo}-{base_task_name}", python=python, version=version

0 commit comments

Comments
 (0)