Skip to content

Commit 536544a

Browse files
committed
add shrub pyopenssl
1 parent 335b728 commit 536544a

File tree

2 files changed

+32
-51
lines changed

2 files changed

+32
-51
lines changed

.evergreen/config.yml

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2305,16 +2305,6 @@ axes:
23052305
variables:
23062306
COVERAGE: "coverage"
23072307

2308-
# Run pyopenssl tests?
2309-
- id: pyopenssl
2310-
display_name: "PyOpenSSL"
2311-
values:
2312-
- id: "enabled"
2313-
display_name: "PyOpenSSL"
2314-
variables:
2315-
test_pyopenssl: true
2316-
batchtime: 10080 # 7 days
2317-
23182308
- id: versionedApi
23192309
display_name: "versionedApi"
23202310
values:
@@ -3216,47 +3206,6 @@ buildvariants:
32163206
tasks:
32173207
- ".6.0"
32183208

3219-
- matrix_name: "tests-pyopenssl"
3220-
matrix_spec:
3221-
platform: rhel8
3222-
python-version: "*"
3223-
auth: "*"
3224-
ssl: "ssl"
3225-
pyopenssl: "*"
3226-
# Only test "noauth" with Python 3.9.
3227-
exclude_spec:
3228-
platform: rhel8
3229-
python-version: ["3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10"]
3230-
auth: "noauth"
3231-
ssl: "ssl"
3232-
pyopenssl: "*"
3233-
display_name: "PyOpenSSL ${platform} ${python-version} ${auth}"
3234-
tasks:
3235-
- '.replica_set'
3236-
# Test standalone and sharded only on 7.0.
3237-
- '.7.0'
3238-
3239-
- matrix_name: "tests-pyopenssl-macOS"
3240-
matrix_spec:
3241-
platform: macos
3242-
auth: "auth"
3243-
ssl: "ssl"
3244-
pyopenssl: "*"
3245-
display_name: "PyOpenSSL ${platform} ${auth}"
3246-
tasks:
3247-
- '.replica_set'
3248-
3249-
- matrix_name: "tests-pyopenssl-windows"
3250-
matrix_spec:
3251-
platform: windows
3252-
python-version-windows: "*"
3253-
auth: "auth"
3254-
ssl: "ssl"
3255-
pyopenssl: "*"
3256-
display_name: "PyOpenSSL ${platform} ${python-version-windows} ${auth}"
3257-
tasks:
3258-
- '.replica_set'
3259-
32603209
- matrix_name: "tests-python-version-rhel8-without-c-extensions"
32613210
matrix_spec:
32623211
platform: rhel8

.evergreen/scripts/generate_config.py

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,38 @@ def create_load_balancer_variants():
345345
return variants
346346

347347

348+
def create_pyopenssl_variants():
349+
base_name = "PyOpenSSL"
350+
batchtime = BATCHTIME_WEEK
351+
base_expansions = dict(test_pyopenssl="true", SSL="ssl")
352+
variants = []
353+
354+
for python in ALL_PYTHONS:
355+
# Only test "noauth" with min python.
356+
auth = "noauth" if python == CPYTHONS[0] else "auth"
357+
if python == CPYTHONS[0]:
358+
host = "macos"
359+
elif python == CPYTHONS[-1]:
360+
host = "win64"
361+
else:
362+
host = "rhel8"
363+
expansions = dict(AUTH=auth)
364+
expansions.update(base_expansions)
365+
366+
display_name = get_display_name(base_name, host, python=python)
367+
variant = create_variant(
368+
[".replica_set", ".7.0"],
369+
display_name,
370+
python=python,
371+
host=host,
372+
expansions=expansions,
373+
batchtime=batchtime,
374+
)
375+
variants.append(variant)
376+
377+
return variants
378+
379+
348380
def create_compression_variants():
349381
# Compression tests - standalone versions of each server, across python versions, with and without c extensions.
350382
# PyPy interpreters are always tested without extensions.

0 commit comments

Comments
 (0)