Skip to content

Commit 5e04104

Browse files
blink1073blink1073
committed
fix up matrix
1 parent 5b69e09 commit 5e04104

File tree

2 files changed

+118
-19
lines changed

2 files changed

+118
-19
lines changed

‎.evergreen/generated_configs/variants.yml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,3 +1285,97 @@ buildvariants:
12851285
AUTH: auth
12861286
SSL: ssl
12871287
PYTHON_BINARY: /opt/python/3.13/bin/python3
1288+
1289+
# Storage engine tests
1290+
- name: storage-inmemory-rhel8-py3.9
1291+
tasks:
1292+
- name: .standalone .noauth .nossl .4.0 .sync_async
1293+
- name: .standalone .noauth .nossl .4.4 .sync_async
1294+
- name: .standalone .noauth .nossl .5.0 .sync_async
1295+
- name: .standalone .noauth .nossl .6.0 .sync_async
1296+
- name: .standalone .noauth .nossl .7.0 .sync_async
1297+
- name: .standalone .noauth .nossl .8.0 .sync_async
1298+
- name: .standalone .noauth .nossl .rapid .sync_async
1299+
- name: .standalone .noauth .nossl .latest .sync_async
1300+
display_name: Storage InMemory RHEL8 py3.9
1301+
run_on:
1302+
- rhel87-small
1303+
expansions:
1304+
STORAGE_ENGINE: inmemory
1305+
PYTHON_BINARY: /opt/python/3.9/bin/python3
1306+
- name: storage-mmapv1-rhel8-py3.9
1307+
tasks:
1308+
- name: .standalone .4.0 .noauth .nossl .sync_async
1309+
- name: .replica_set .4.0 .noauth .nossl .sync_async
1310+
display_name: Storage MMAPv1 RHEL8 py3.9
1311+
run_on:
1312+
- rhel87-small
1313+
expansions:
1314+
STORAGE_ENGINE: mmapv1
1315+
PYTHON_BINARY: /opt/python/3.9/bin/python3
1316+
1317+
# Versioned api tests
1318+
- name: versioned-api-require-v1-rhel8-py3.9-auth
1319+
tasks:
1320+
- name: .5.0 .auth .ssl .sync_async
1321+
- name: .6.0 .auth .ssl .sync_async
1322+
- name: .7.0 .auth .ssl .sync_async
1323+
- name: .8.0 .auth .ssl .sync_async
1324+
- name: .rapid .auth .ssl .sync_async
1325+
- name: .latest .auth .ssl .sync_async
1326+
display_name: Versioned API require v1 RHEL8 py3.9 Auth
1327+
run_on:
1328+
- rhel87-small
1329+
expansions:
1330+
AUTH: auth
1331+
REQUIRE_API_VERSION: "1"
1332+
MONGODB_API_VERSION: "1"
1333+
PYTHON_BINARY: /opt/python/3.9/bin/python3
1334+
tags: [versionedApi_tag]
1335+
- name: versioned-api-require-v1-rhel8-py3.13-auth
1336+
tasks:
1337+
- name: .5.0 .auth .ssl .sync_async
1338+
- name: .6.0 .auth .ssl .sync_async
1339+
- name: .7.0 .auth .ssl .sync_async
1340+
- name: .8.0 .auth .ssl .sync_async
1341+
- name: .rapid .auth .ssl .sync_async
1342+
- name: .latest .auth .ssl .sync_async
1343+
display_name: Versioned API require v1 RHEL8 py3.13 Auth
1344+
run_on:
1345+
- rhel87-small
1346+
expansions:
1347+
AUTH: auth
1348+
REQUIRE_API_VERSION: "1"
1349+
MONGODB_API_VERSION: "1"
1350+
PYTHON_BINARY: /opt/python/3.13/bin/python3
1351+
tags: [versionedApi_tag]
1352+
- name: versioned-api-accept-v2-rhel8-py3.9
1353+
tasks:
1354+
- name: .5.0 .noauth .nossl .sync_async
1355+
- name: .6.0 .noauth .nossl .sync_async
1356+
- name: .7.0 .noauth .nossl .sync_async
1357+
- name: .8.0 .noauth .nossl .sync_async
1358+
- name: .rapid .noauth .nossl .sync_async
1359+
- name: .latest .noauth .nossl .sync_async
1360+
display_name: Versioned API accept v2 RHEL8 py3.9
1361+
run_on:
1362+
- rhel87-small
1363+
expansions:
1364+
ORCHESTRATION_FILE: versioned-api-testing.json
1365+
PYTHON_BINARY: /opt/python/3.9/bin/python3
1366+
tags: [versionedApi_tag]
1367+
- name: versioned-api-accept-v2-rhel8-py3.13
1368+
tasks:
1369+
- name: .5.0 .noauth .nossl .sync_async
1370+
- name: .6.0 .noauth .nossl .sync_async
1371+
- name: .7.0 .noauth .nossl .sync_async
1372+
- name: .8.0 .noauth .nossl .sync_async
1373+
- name: .rapid .noauth .nossl .sync_async
1374+
- name: .latest .noauth .nossl .sync_async
1375+
display_name: Versioned API accept v2 RHEL8 py3.13
1376+
run_on:
1377+
- rhel87-small
1378+
expansions:
1379+
ORCHESTRATION_FILE: versioned-api-testing.json
1380+
PYTHON_BINARY: /opt/python/3.13/bin/python3
1381+
tags: [versionedApi_tag]

‎.evergreen/scripts/generate_config.py

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ def create_pyopenssl_variants():
467467
return variants
468468

469469

470-
def create_storage_engine_tests():
470+
def create_storage_engine_variants():
471471
host = "rhel8"
472472
engines = ["InMemory", "MMAPv1"]
473473
variants = []
@@ -490,29 +490,34 @@ def create_storage_engine_tests():
490490
return variants
491491

492492

493-
def create_versioned_api_tests():
493+
def create_versioned_api_variants():
494494
host = "rhel8"
495495
tags = ["versionedApi_tag"]
496-
tasks = [f".standalone .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")]
497496
variants = []
498-
types = ["require v1", "accept v2"]
499497

500-
# All python versions across platforms.
501-
for python, test_type in product(MIN_MAX_PYTHON, types):
498+
for python in MIN_MAX_PYTHON:
502499
expansions = dict(AUTH="auth")
503-
# Test against a cluster with requireApiVersion=1.
504-
if test_type == types[0]:
505-
# REQUIRE_API_VERSION is set to make drivers-evergreen-tools
506-
# start a cluster with the requireApiVersion parameter.
507-
expansions["REQUIRE_API_VERSION"] = "1"
508-
# MONGODB_API_VERSION is the apiVersion to use in the test suite.
509-
expansions["MONGODB_API_VERSION"] = "1"
510-
else:
511-
# Test against a cluster with acceptApiVersion2 but without
512-
# requireApiVersion, and don't automatically add apiVersion to
513-
# clients created in the test suite.
514-
expansions["ORCHESTRATION_FILE"] = "versioned-api-testing.json"
515-
base_display_name = f"Versioned API {test_type}"
500+
tasks = [f".{v} .auth .ssl .sync_async" for v in get_versions_from("5.0")]
501+
# REQUIRE_API_VERSION is set to make drivers-evergreen-tools
502+
# start a cluster with the requireApiVersion parameter.
503+
expansions["REQUIRE_API_VERSION"] = "1"
504+
# MONGODB_API_VERSION is the apiVersion to use in the test suite.
505+
expansions["MONGODB_API_VERSION"] = "1"
506+
base_display_name = "Versioned API require v1"
507+
display_name = get_display_name(base_display_name, host, python=python, **expansions)
508+
variant = create_variant(
509+
tasks, display_name, host=host, python=python, tags=tags, expansions=expansions
510+
)
511+
variants.append(variant)
512+
513+
for python in MIN_MAX_PYTHON:
514+
expansions = dict()
515+
tasks = [f".{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")]
516+
# Test against a cluster with acceptApiVersion2 but without
517+
# requireApiVersion, and don't automatically add apiVersion to
518+
# clients created in the test suite.
519+
expansions["ORCHESTRATION_FILE"] = "versioned-api-testing.json"
520+
base_display_name = "Versioned API accept v2"
516521
display_name = get_display_name(base_display_name, host, python=python, **expansions)
517522
variant = create_variant(
518523
tasks, display_name, host=host, python=python, tags=tags, expansions=expansions

0 commit comments

Comments
 (0)