Skip to content

Commit b2349f4

Browse files
blink1073blink1073
committed
update matrix
1 parent 38bd710 commit b2349f4

File tree

2 files changed

+70
-156
lines changed

2 files changed

+70
-156
lines changed

‎.evergreen/config.yml

Lines changed: 42 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -2841,7 +2841,9 @@ buildvariants:
28412841
# Encryption tests.
28422842
- name: encryption-rhel8-py3.9-auth-ssl
28432843
tasks:
2844+
- name: .standalone
28442845
- name: .replica_set
2846+
- name: .sharded_cluster
28452847
display_name: Encryption RHEL8 py3.9 Auth SSL
28462848
run_on:
28472849
- rhel87-small
@@ -2852,48 +2854,11 @@ buildvariants:
28522854
SSL: ssl
28532855
PYTHON_BINARY: /opt/python/3.9/bin/python3
28542856
tags: [encryption_tag]
2855-
- name: encryption-rhel8-py3.10-auth-nossl
2856-
tasks:
2857-
- name: .replica_set
2858-
display_name: Encryption RHEL8 py3.10 Auth NoSSL
2859-
run_on:
2860-
- rhel87-small
2861-
batchtime: 10080
2862-
expansions:
2863-
TEST_ENCRYPTION: "true"
2864-
AUTH: auth
2865-
SSL: nossl
2866-
PYTHON_BINARY: /opt/python/3.10/bin/python3
2867-
tags: [encryption_tag]
2868-
- name: encryption-rhel8-py3.11-auth-ssl
2869-
tasks:
2870-
- name: .replica_set
2871-
display_name: Encryption RHEL8 py3.11 Auth SSL
2872-
run_on:
2873-
- rhel87-small
2874-
batchtime: 10080
2875-
expansions:
2876-
TEST_ENCRYPTION: "true"
2877-
AUTH: auth
2878-
SSL: ssl
2879-
PYTHON_BINARY: /opt/python/3.11/bin/python3
2880-
tags: [encryption_tag]
2881-
- name: encryption-rhel8-py3.12-auth-nossl
2882-
tasks:
2883-
- name: .replica_set
2884-
display_name: Encryption RHEL8 py3.12 Auth NoSSL
2885-
run_on:
2886-
- rhel87-small
2887-
batchtime: 10080
2888-
expansions:
2889-
TEST_ENCRYPTION: "true"
2890-
AUTH: auth
2891-
SSL: nossl
2892-
PYTHON_BINARY: /opt/python/3.12/bin/python3
2893-
tags: [encryption_tag]
28942857
- name: encryption-rhel8-py3.13-auth-ssl
28952858
tasks:
2859+
- name: .standalone
28962860
- name: .replica_set
2861+
- name: .sharded_cluster
28972862
display_name: Encryption RHEL8 py3.13 Auth SSL
28982863
run_on:
28992864
- rhel87-small
@@ -2904,22 +2869,11 @@ buildvariants:
29042869
SSL: ssl
29052870
PYTHON_BINARY: /opt/python/3.13/bin/python3
29062871
tags: [encryption_tag]
2907-
- name: encryption-rhel8-pypy3.9-auth-nossl
2908-
tasks:
2909-
- name: .replica_set
2910-
display_name: Encryption RHEL8 pypy3.9 Auth NoSSL
2911-
run_on:
2912-
- rhel87-small
2913-
batchtime: 10080
2914-
expansions:
2915-
TEST_ENCRYPTION: "true"
2916-
AUTH: auth
2917-
SSL: nossl
2918-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
2919-
tags: [encryption_tag]
29202872
- name: encryption-rhel8-pypy3.10-auth-ssl
29212873
tasks:
2874+
- name: .standalone
29222875
- name: .replica_set
2876+
- name: .sharded_cluster
29232877
display_name: Encryption RHEL8 pypy3.10 Auth SSL
29242878
run_on:
29252879
- rhel87-small
@@ -2932,7 +2886,9 @@ buildvariants:
29322886
tags: [encryption_tag]
29332887
- name: encryption-crypt_shared-rhel8-py3.9-auth-ssl
29342888
tasks:
2889+
- name: .standalone
29352890
- name: .replica_set
2891+
- name: .sharded_cluster
29362892
display_name: Encryption crypt_shared RHEL8 py3.9 Auth SSL
29372893
run_on:
29382894
- rhel87-small
@@ -2944,51 +2900,11 @@ buildvariants:
29442900
TEST_CRYPT_SHARED: "true"
29452901
PYTHON_BINARY: /opt/python/3.9/bin/python3
29462902
tags: [encryption_tag]
2947-
- name: encryption-crypt_shared-rhel8-py3.10-auth-nossl
2948-
tasks:
2949-
- name: .replica_set
2950-
display_name: Encryption crypt_shared RHEL8 py3.10 Auth NoSSL
2951-
run_on:
2952-
- rhel87-small
2953-
batchtime: 10080
2954-
expansions:
2955-
TEST_ENCRYPTION: "true"
2956-
AUTH: auth
2957-
SSL: nossl
2958-
TEST_CRYPT_SHARED: "true"
2959-
PYTHON_BINARY: /opt/python/3.10/bin/python3
2960-
tags: [encryption_tag]
2961-
- name: encryption-crypt_shared-rhel8-py3.11-auth-ssl
2962-
tasks:
2963-
- name: .replica_set
2964-
display_name: Encryption crypt_shared RHEL8 py3.11 Auth SSL
2965-
run_on:
2966-
- rhel87-small
2967-
batchtime: 10080
2968-
expansions:
2969-
TEST_ENCRYPTION: "true"
2970-
AUTH: auth
2971-
SSL: ssl
2972-
TEST_CRYPT_SHARED: "true"
2973-
PYTHON_BINARY: /opt/python/3.11/bin/python3
2974-
tags: [encryption_tag]
2975-
- name: encryption-crypt_shared-rhel8-py3.12-auth-nossl
2976-
tasks:
2977-
- name: .replica_set
2978-
display_name: Encryption crypt_shared RHEL8 py3.12 Auth NoSSL
2979-
run_on:
2980-
- rhel87-small
2981-
batchtime: 10080
2982-
expansions:
2983-
TEST_ENCRYPTION: "true"
2984-
AUTH: auth
2985-
SSL: nossl
2986-
TEST_CRYPT_SHARED: "true"
2987-
PYTHON_BINARY: /opt/python/3.12/bin/python3
2988-
tags: [encryption_tag]
29892903
- name: encryption-crypt_shared-rhel8-py3.13-auth-ssl
29902904
tasks:
2905+
- name: .standalone
29912906
- name: .replica_set
2907+
- name: .sharded_cluster
29922908
display_name: Encryption crypt_shared RHEL8 py3.13 Auth SSL
29932909
run_on:
29942910
- rhel87-small
@@ -3000,23 +2916,11 @@ buildvariants:
30002916
TEST_CRYPT_SHARED: "true"
30012917
PYTHON_BINARY: /opt/python/3.13/bin/python3
30022918
tags: [encryption_tag]
3003-
- name: encryption-crypt_shared-rhel8-pypy3.9-auth-nossl
3004-
tasks:
3005-
- name: .replica_set
3006-
display_name: Encryption crypt_shared RHEL8 pypy3.9 Auth NoSSL
3007-
run_on:
3008-
- rhel87-small
3009-
batchtime: 10080
3010-
expansions:
3011-
TEST_ENCRYPTION: "true"
3012-
AUTH: auth
3013-
SSL: nossl
3014-
TEST_CRYPT_SHARED: "true"
3015-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
3016-
tags: [encryption_tag]
30172919
- name: encryption-crypt_shared-rhel8-pypy3.10-auth-ssl
30182920
tasks:
2921+
- name: .standalone
30192922
- name: .replica_set
2923+
- name: .sharded_cluster
30202924
display_name: Encryption crypt_shared RHEL8 pypy3.10 Auth SSL
30212925
run_on:
30222926
- rhel87-small
@@ -3030,7 +2934,9 @@ buildvariants:
30302934
tags: [encryption_tag]
30312935
- name: encryption-pyopenssl-rhel8-py3.9-auth-ssl
30322936
tasks:
2937+
- name: .standalone
30332938
- name: .replica_set
2939+
- name: .sharded_cluster
30342940
display_name: Encryption PyOpenSSL RHEL8 py3.9 Auth SSL
30352941
run_on:
30362942
- rhel87-small
@@ -3042,24 +2948,28 @@ buildvariants:
30422948
TEST_ENCRYPTION_PYOPENSSL: "true"
30432949
PYTHON_BINARY: /opt/python/3.9/bin/python3
30442950
tags: [encryption_tag]
3045-
- name: encryption-pyopenssl-rhel8-py3.10-auth-nossl
2951+
- name: encryption-pyopenssl-rhel8-py3.13-auth-ssl
30462952
tasks:
2953+
- name: .standalone
30472954
- name: .replica_set
3048-
display_name: Encryption PyOpenSSL RHEL8 py3.10 Auth NoSSL
2955+
- name: .sharded_cluster
2956+
display_name: Encryption PyOpenSSL RHEL8 py3.13 Auth SSL
30492957
run_on:
30502958
- rhel87-small
30512959
batchtime: 10080
30522960
expansions:
30532961
TEST_ENCRYPTION: "true"
30542962
AUTH: auth
3055-
SSL: nossl
2963+
SSL: ssl
30562964
TEST_ENCRYPTION_PYOPENSSL: "true"
3057-
PYTHON_BINARY: /opt/python/3.10/bin/python3
2965+
PYTHON_BINARY: /opt/python/3.13/bin/python3
30582966
tags: [encryption_tag]
3059-
- name: encryption-pyopenssl-rhel8-py3.11-auth-ssl
2967+
- name: encryption-pyopenssl-rhel8-pypy3.10-auth-ssl
30602968
tasks:
2969+
- name: .standalone
30612970
- name: .replica_set
3062-
display_name: Encryption PyOpenSSL RHEL8 py3.11 Auth SSL
2971+
- name: .sharded_cluster
2972+
display_name: Encryption PyOpenSSL RHEL8 pypy3.10 Auth SSL
30632973
run_on:
30642974
- rhel87-small
30652975
batchtime: 10080
@@ -3068,64 +2978,50 @@ buildvariants:
30682978
AUTH: auth
30692979
SSL: ssl
30702980
TEST_ENCRYPTION_PYOPENSSL: "true"
3071-
PYTHON_BINARY: /opt/python/3.11/bin/python3
2981+
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
30722982
tags: [encryption_tag]
3073-
- name: encryption-pyopenssl-rhel8-py3.12-auth-nossl
2983+
- name: encryption-rhel8-py3.10-auth-ssl
30742984
tasks:
30752985
- name: .replica_set
3076-
display_name: Encryption PyOpenSSL RHEL8 py3.12 Auth NoSSL
2986+
display_name: Encryption RHEL8 py3.10 Auth SSL
30772987
run_on:
30782988
- rhel87-small
3079-
batchtime: 10080
30802989
expansions:
3081-
TEST_ENCRYPTION: "true"
30822990
AUTH: auth
3083-
SSL: nossl
3084-
TEST_ENCRYPTION_PYOPENSSL: "true"
3085-
PYTHON_BINARY: /opt/python/3.12/bin/python3
3086-
tags: [encryption_tag]
3087-
- name: encryption-pyopenssl-rhel8-py3.13-auth-ssl
2991+
SSL: ssl
2992+
PYTHON_BINARY: /opt/python/3.10/bin/python3
2993+
- name: encryption-crypt_shared-rhel8-py3.11-auth-nossl
30882994
tasks:
30892995
- name: .replica_set
3090-
display_name: Encryption PyOpenSSL RHEL8 py3.13 Auth SSL
2996+
display_name: Encryption crypt_shared RHEL8 py3.11 Auth NoSSL
30912997
run_on:
30922998
- rhel87-small
3093-
batchtime: 10080
30942999
expansions:
3095-
TEST_ENCRYPTION: "true"
30963000
AUTH: auth
3097-
SSL: ssl
3098-
TEST_ENCRYPTION_PYOPENSSL: "true"
3099-
PYTHON_BINARY: /opt/python/3.13/bin/python3
3100-
tags: [encryption_tag]
3101-
- name: encryption-pyopenssl-rhel8-pypy3.9-auth-nossl
3001+
SSL: nossl
3002+
TEST_CRYPT_SHARED: "true"
3003+
PYTHON_BINARY: /opt/python/3.11/bin/python3
3004+
- name: encryption-pyopenssl-rhel8-py3.12-auth-ssl
31023005
tasks:
31033006
- name: .replica_set
3104-
display_name: Encryption PyOpenSSL RHEL8 pypy3.9 Auth NoSSL
3007+
display_name: Encryption PyOpenSSL RHEL8 py3.12 Auth SSL
31053008
run_on:
31063009
- rhel87-small
3107-
batchtime: 10080
31083010
expansions:
3109-
TEST_ENCRYPTION: "true"
31103011
AUTH: auth
3111-
SSL: nossl
3012+
SSL: ssl
31123013
TEST_ENCRYPTION_PYOPENSSL: "true"
3113-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
3114-
tags: [encryption_tag]
3115-
- name: encryption-pyopenssl-rhel8-pypy3.10-auth-ssl
3014+
PYTHON_BINARY: /opt/python/3.12/bin/python3
3015+
- name: encryption-rhel8-pypy3.9-auth-nossl
31163016
tasks:
31173017
- name: .replica_set
3118-
display_name: Encryption PyOpenSSL RHEL8 pypy3.10 Auth SSL
3018+
display_name: Encryption RHEL8 pypy3.9 Auth NoSSL
31193019
run_on:
31203020
- rhel87-small
3121-
batchtime: 10080
31223021
expansions:
3123-
TEST_ENCRYPTION: "true"
31243022
AUTH: auth
3125-
SSL: ssl
3126-
TEST_ENCRYPTION_PYOPENSSL: "true"
3127-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
3128-
tags: [encryption_tag]
3023+
SSL: nossl
3024+
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
31293025
- name: encryption-macos-py3.9-auth-ssl
31303026
tasks:
31313027
- name: .latest .replica_set

‎.evergreen/scripts/generate_config.py

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,23 +245,25 @@ def create_server_variants() -> list[BuildVariant]:
245245

246246
def create_encryption_variants() -> list[BuildVariant]:
247247
variants = []
248-
task_names = [".replica_set"]
249248
tags = ["encryption_tag"]
250249
batchtime = BATCHTIME_WEEK
251250

252-
host = "rhel8"
253-
encryptions = ["Encryption", "Encryption crypt_shared", "Encryption PyOpenSSL"]
254-
for encryption, (python, ssl) in product(
255-
encryptions, zip_cycle(CPYTHONS + PYPYS, ["ssl", "nossl"])
256-
):
257-
expansions = dict(TEST_ENCRYPTION="true", AUTH="auth", SSL=ssl)
251+
def expansions_for_type(encryption, expansions):
258252
if "crypt_shared" in encryption:
259253
expansions["TEST_CRYPT_SHARED"] = "true"
260254
if "PyOpenSSL" in encryption:
261255
expansions["TEST_ENCRYPTION_PYOPENSSL"] = "true"
256+
257+
host = "rhel8"
258+
259+
# Test against all server versions and topolgies for the three main python versions.
260+
encryptions = ["Encryption", "Encryption crypt_shared", "Encryption PyOpenSSL"]
261+
for encryption, python in product(encryptions, [*MIN_MAX_PYTHON, PYPYS[-1]]):
262+
expansions = dict(TEST_ENCRYPTION="true", AUTH="auth", SSL="ssl")
263+
expansions_for_type(encryption, expansions)
262264
display_name = get_display_name(encryption, host, python=python, **expansions)
263265
variant = create_variant(
264-
task_names,
266+
[f".{t}" for t in TOPOLOGIES],
265267
display_name,
266268
python=python,
267269
host=host,
@@ -271,13 +273,29 @@ def create_encryption_variants() -> list[BuildVariant]:
271273
)
272274
variants.append(variant)
273275

276+
# Test the rest of the pythons on linux for all server versions.
277+
for encryption, python, ssl in zip_cycle(
278+
encryptions, CPYTHONS[1:-1] + PYPYS[:-1], ["ssl", "nossl"]
279+
):
280+
expansions = dict(AUTH="auth", SSL=ssl)
281+
expansions_for_type(encryption, expansions)
282+
display_name = get_display_name(encryption, host, python=python, **expansions)
283+
variant = create_variant(
284+
[".replica_set"],
285+
display_name,
286+
python=python,
287+
host=host,
288+
expansions=expansions,
289+
)
290+
variants.append(variant)
291+
292+
# Test on macos and linux on one server version and topology for min and max python.
274293
encryptions = ["Encryption", "Encryption crypt_shared"]
275294
task_names = [".latest .replica_set"]
276295
for host, encryption, python in product(["macos", "win64"], encryptions, MIN_MAX_PYTHON):
277296
ssl = "ssl" if python == CPYTHONS[0] else "nossl"
278297
expansions = dict(TEST_ENCRYPTION="true", AUTH="auth", SSL=ssl)
279-
if "crypt_shared" in encryption:
280-
expansions["TEST_CRYPT_SHARED"] = "true"
298+
expansions_for_type(encryption, expansions)
281299
display_name = get_display_name(encryption, host, python=python, **expansions)
282300
variant = create_variant(
283301
task_names,

0 commit comments

Comments
 (0)