Skip to content

Commit 5c1b685

Browse files
blink1073blink1073
committed
skip csot
1 parent f7c61d3 commit 5c1b685

File tree

2 files changed

+42
-4
lines changed

2 files changed

+42
-4
lines changed

‎.evergreen/config.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2582,6 +2582,7 @@ buildvariants:
25822582
SSL: ssl
25832583
TEST_SUITES: default
25842584
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2585+
SKIP_CSOT_TESTS: "true"
25852586
- name: test-macos-py3.9-auth-ssl-async
25862587
tasks:
25872588
- name: .sharded_cluster
@@ -2593,6 +2594,7 @@ buildvariants:
25932594
SSL: ssl
25942595
TEST_SUITES: default_async
25952596
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2597+
SKIP_CSOT_TESTS: "true"
25962598
- name: test-macos-py3.9-noauth-nossl-sync
25972599
tasks:
25982600
- name: .sharded_cluster
@@ -2604,6 +2606,7 @@ buildvariants:
26042606
SSL: nossl
26052607
TEST_SUITES: default
26062608
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2609+
SKIP_CSOT_TESTS: "true"
26072610
- name: test-macos-py3.9-noauth-nossl-async
26082611
tasks:
26092612
- name: .sharded_cluster
@@ -2615,6 +2618,7 @@ buildvariants:
26152618
SSL: nossl
26162619
TEST_SUITES: default_async
26172620
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2621+
SKIP_CSOT_TESTS: "true"
26182622
- name: test-macos-py3.13-auth-ssl-sync
26192623
tasks:
26202624
- name: .sharded_cluster
@@ -2626,6 +2630,7 @@ buildvariants:
26262630
SSL: ssl
26272631
TEST_SUITES: default
26282632
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2633+
SKIP_CSOT_TESTS: "true"
26292634
- name: test-macos-py3.13-auth-ssl-async
26302635
tasks:
26312636
- name: .sharded_cluster
@@ -2637,6 +2642,7 @@ buildvariants:
26372642
SSL: ssl
26382643
TEST_SUITES: default_async
26392644
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2645+
SKIP_CSOT_TESTS: "true"
26402646
- name: test-macos-py3.13-noauth-nossl-sync
26412647
tasks:
26422648
- name: .sharded_cluster
@@ -2648,6 +2654,7 @@ buildvariants:
26482654
SSL: nossl
26492655
TEST_SUITES: default
26502656
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2657+
SKIP_CSOT_TESTS: "true"
26512658
- name: test-macos-py3.13-noauth-nossl-async
26522659
tasks:
26532660
- name: .sharded_cluster
@@ -2659,6 +2666,7 @@ buildvariants:
26592666
SSL: nossl
26602667
TEST_SUITES: default_async
26612668
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2669+
SKIP_CSOT_TESTS: "true"
26622670

26632671
# Server tests for macOS (arm).
26642672
- name: test-macos-arm-py3.9-auth-ssl-sync
@@ -2672,6 +2680,7 @@ buildvariants:
26722680
SSL: ssl
26732681
TEST_SUITES: default
26742682
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2683+
SKIP_CSOT_TESTS: "true"
26752684
- name: test-macos-arm-py3.9-auth-ssl-async
26762685
tasks:
26772686
- name: .sharded_cluster
@@ -2683,6 +2692,7 @@ buildvariants:
26832692
SSL: ssl
26842693
TEST_SUITES: default_async
26852694
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2695+
SKIP_CSOT_TESTS: "true"
26862696
- name: test-macos-arm-py3.9-noauth-nossl-sync
26872697
tasks:
26882698
- name: .sharded_cluster
@@ -2694,6 +2704,7 @@ buildvariants:
26942704
SSL: nossl
26952705
TEST_SUITES: default
26962706
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2707+
SKIP_CSOT_TESTS: "true"
26972708
- name: test-macos-arm-py3.9-noauth-nossl-async
26982709
tasks:
26992710
- name: .sharded_cluster
@@ -2705,6 +2716,7 @@ buildvariants:
27052716
SSL: nossl
27062717
TEST_SUITES: default_async
27072718
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2719+
SKIP_CSOT_TESTS: "true"
27082720
- name: test-macos-arm-py3.13-auth-ssl-sync
27092721
tasks:
27102722
- name: .sharded_cluster
@@ -2716,6 +2728,7 @@ buildvariants:
27162728
SSL: ssl
27172729
TEST_SUITES: default
27182730
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2731+
SKIP_CSOT_TESTS: "true"
27192732
- name: test-macos-arm-py3.13-auth-ssl-async
27202733
tasks:
27212734
- name: .sharded_cluster
@@ -2727,6 +2740,7 @@ buildvariants:
27272740
SSL: ssl
27282741
TEST_SUITES: default_async
27292742
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2743+
SKIP_CSOT_TESTS: "true"
27302744
- name: test-macos-arm-py3.13-noauth-nossl-sync
27312745
tasks:
27322746
- name: .sharded_cluster
@@ -2738,6 +2752,7 @@ buildvariants:
27382752
SSL: nossl
27392753
TEST_SUITES: default
27402754
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2755+
SKIP_CSOT_TESTS: "true"
27412756
- name: test-macos-arm-py3.13-noauth-nossl-async
27422757
tasks:
27432758
- name: .sharded_cluster
@@ -2749,6 +2764,7 @@ buildvariants:
27492764
SSL: nossl
27502765
TEST_SUITES: default_async
27512766
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2767+
SKIP_CSOT_TESTS: "true"
27522768

27532769
# Server tests for Windows.
27542770
- name: test-win64-py-3.9-auth-ssl-sync
@@ -2762,6 +2778,7 @@ buildvariants:
27622778
SSL: ssl
27632779
TEST_SUITES: default
27642780
PYTHON_BINARY: C:/python/Python39/python.exe
2781+
SKIP_CSOT_TESTS: "true"
27652782
- name: test-win64-py-3.9-auth-ssl-async
27662783
tasks:
27672784
- name: .sharded_cluster
@@ -2773,6 +2790,7 @@ buildvariants:
27732790
SSL: ssl
27742791
TEST_SUITES: default_async
27752792
PYTHON_BINARY: C:/python/Python39/python.exe
2793+
SKIP_CSOT_TESTS: "true"
27762794
- name: test-win64-py-3.9-noauth-nossl-sync
27772795
tasks:
27782796
- name: .sharded_cluster
@@ -2784,6 +2802,7 @@ buildvariants:
27842802
SSL: nossl
27852803
TEST_SUITES: default
27862804
PYTHON_BINARY: C:/python/Python39/python.exe
2805+
SKIP_CSOT_TESTS: "true"
27872806
- name: test-win64-py-3.9-noauth-nossl-async
27882807
tasks:
27892808
- name: .sharded_cluster
@@ -2795,6 +2814,7 @@ buildvariants:
27952814
SSL: nossl
27962815
TEST_SUITES: default_async
27972816
PYTHON_BINARY: C:/python/Python39/python.exe
2817+
SKIP_CSOT_TESTS: "true"
27982818
- name: test-win64-py-3.13-auth-ssl-sync
27992819
tasks:
28002820
- name: .sharded_cluster
@@ -2806,6 +2826,7 @@ buildvariants:
28062826
SSL: ssl
28072827
TEST_SUITES: default
28082828
PYTHON_BINARY: C:/python/Python313/python.exe
2829+
SKIP_CSOT_TESTS: "true"
28092830
- name: test-win64-py-3.13-auth-ssl-async
28102831
tasks:
28112832
- name: .sharded_cluster
@@ -2817,6 +2838,7 @@ buildvariants:
28172838
SSL: ssl
28182839
TEST_SUITES: default_async
28192840
PYTHON_BINARY: C:/python/Python313/python.exe
2841+
SKIP_CSOT_TESTS: "true"
28202842
- name: test-win64-py-3.13-noauth-nossl-sync
28212843
tasks:
28222844
- name: .sharded_cluster
@@ -2828,6 +2850,7 @@ buildvariants:
28282850
SSL: nossl
28292851
TEST_SUITES: default
28302852
PYTHON_BINARY: C:/python/Python313/python.exe
2853+
SKIP_CSOT_TESTS: "true"
28312854
- name: test-win64-py-3.13-noauth-nossl-async
28322855
tasks:
28332856
- name: .sharded_cluster
@@ -2839,6 +2862,7 @@ buildvariants:
28392862
SSL: nossl
28402863
TEST_SUITES: default_async
28412864
PYTHON_BINARY: C:/python/Python313/python.exe
2865+
SKIP_CSOT_TESTS: "true"
28422866

28432867
# Server tests for Windows (32-bit).
28442868
- name: test-win64-32-bit-py3.9-auth-ssl-sync
@@ -2852,6 +2876,7 @@ buildvariants:
28522876
SSL: ssl
28532877
TEST_SUITES: default
28542878
PYTHON_BINARY: C:/python/32/Python39/python.exe
2879+
SKIP_CSOT_TESTS: "true"
28552880
- name: test-win64-32-bit-py3.9-auth-ssl-async
28562881
tasks:
28572882
- name: .sharded_cluster
@@ -2863,6 +2888,7 @@ buildvariants:
28632888
SSL: ssl
28642889
TEST_SUITES: default_async
28652890
PYTHON_BINARY: C:/python/32/Python39/python.exe
2891+
SKIP_CSOT_TESTS: "true"
28662892
- name: test-win64-32-bit-py3.9-noauth-nossl-sync
28672893
tasks:
28682894
- name: .sharded_cluster
@@ -2874,6 +2900,7 @@ buildvariants:
28742900
SSL: nossl
28752901
TEST_SUITES: default
28762902
PYTHON_BINARY: C:/python/32/Python39/python.exe
2903+
SKIP_CSOT_TESTS: "true"
28772904
- name: test-win64-32-bit-py3.9-noauth-nossl-async
28782905
tasks:
28792906
- name: .sharded_cluster
@@ -2885,6 +2912,7 @@ buildvariants:
28852912
SSL: nossl
28862913
TEST_SUITES: default_async
28872914
PYTHON_BINARY: C:/python/32/Python39/python.exe
2915+
SKIP_CSOT_TESTS: "true"
28882916
- name: test-win64-32-bit-py3.13-auth-ssl-sync
28892917
tasks:
28902918
- name: .sharded_cluster
@@ -2896,6 +2924,7 @@ buildvariants:
28962924
SSL: ssl
28972925
TEST_SUITES: default
28982926
PYTHON_BINARY: C:/python/32/Python313/python.exe
2927+
SKIP_CSOT_TESTS: "true"
28992928
- name: test-win64-32-bit-py3.13-auth-ssl-async
29002929
tasks:
29012930
- name: .sharded_cluster
@@ -2907,6 +2936,7 @@ buildvariants:
29072936
SSL: ssl
29082937
TEST_SUITES: default_async
29092938
PYTHON_BINARY: C:/python/32/Python313/python.exe
2939+
SKIP_CSOT_TESTS: "true"
29102940
- name: test-win64-32-bit-py3.13-noauth-nossl-sync
29112941
tasks:
29122942
- name: .sharded_cluster
@@ -2918,6 +2948,7 @@ buildvariants:
29182948
SSL: nossl
29192949
TEST_SUITES: default
29202950
PYTHON_BINARY: C:/python/32/Python313/python.exe
2951+
SKIP_CSOT_TESTS: "true"
29212952
- name: test-win64-32-bit-py3.13-noauth-nossl-async
29222953
tasks:
29232954
- name: .sharded_cluster
@@ -2929,6 +2960,7 @@ buildvariants:
29292960
SSL: nossl
29302961
TEST_SUITES: default_async
29312962
PYTHON_BINARY: C:/python/32/Python313/python.exe
2963+
SKIP_CSOT_TESTS: "true"
29322964

29332965
- matrix_name: "tests-fips"
29342966
matrix_spec:

‎.evergreen/scripts/generate_config.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,17 @@ class Host:
4343
name: str
4444
run_on: str
4545
display_name: str
46+
expansions: dict[str, str]
4647

4748

48-
HOSTS["rhel8"] = Host("rhel8", "rhel87-small", "RHEL8")
49-
HOSTS["win64"] = Host("win64", "windows-64-vsMulti-small", "Win64")
50-
HOSTS["macos"] = Host("macos", "macos-14", "macOS")
51-
HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm64", "macOS (arm)")
49+
_macos_expansions = dict( # CSOT tests are unreliable on slow hosts.
50+
SKIP_CSOT_TESTS="true"
51+
)
52+
53+
HOSTS["rhel8"] = Host("rhel8", "rhel87-small", "RHEL8", dict())
54+
HOSTS["win64"] = Host("win64", "windows-64-vsMulti-small", "Win64", _macos_expansions)
55+
HOSTS["macos"] = Host("macos", "macos-14", "macOS", _macos_expansions)
56+
HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm64", "macOS (arm)", _macos_expansions)
5257

5358

5459
##############
@@ -76,6 +81,7 @@ def create_variant(
7681
expansions["PYTHON_BINARY"] = get_python_binary(python, host)
7782
if version:
7883
expansions["VERSION"] = version
84+
expansions.update(HOSTS[host].expansions)
7985
expansions = expansions or None
8086
return BuildVariant(
8187
name=name,

0 commit comments

Comments
 (0)