Skip to content

Commit 87dc126

Browse files
committed
restore no-toolchain tasks
1 parent a783de5 commit 87dc126

File tree

3 files changed

+96
-23
lines changed

3 files changed

+96
-23
lines changed

.evergreen/generated_configs/tasks.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,50 @@ tasks:
328328
PYTHON_VERSION: pypy3.10
329329
tags: [no-orchestration, python-pypy3.10]
330330

331+
# No toolchain tests
332+
- name: test-sync-noauth-nossl-standalone
333+
commands:
334+
- func: run server
335+
vars:
336+
AUTH: noauth
337+
SSL: nossl
338+
TOPOLOGY: standalone
339+
- func: run tests
340+
vars:
341+
AUTH: noauth
342+
SSL: nossl
343+
TOPOLOGY: standalone
344+
TEST_NAME: default_sync
345+
tags: [no-toolchain, standalone-noauth-nossl]
346+
- name: test-async-noauth-ssl-replica-set
347+
commands:
348+
- func: run server
349+
vars:
350+
AUTH: noauth
351+
SSL: ssl
352+
TOPOLOGY: replica_set
353+
- func: run tests
354+
vars:
355+
AUTH: noauth
356+
SSL: ssl
357+
TOPOLOGY: replica_set
358+
TEST_NAME: default_async
359+
tags: [no-toolchain, replica_set-noauth-ssl]
360+
- name: test-sync-auth-ssl-sharded-cluster
361+
commands:
362+
- func: run server
363+
vars:
364+
AUTH: auth
365+
SSL: ssl
366+
TOPOLOGY: sharded_cluster
367+
- func: run tests
368+
vars:
369+
AUTH: auth
370+
SSL: ssl
371+
TOPOLOGY: sharded_cluster
372+
TEST_NAME: default_sync
373+
tags: [no-toolchain, sharded_cluster-auth-ssl]
374+
331375
# Ocsp tests
332376
- name: test-ocsp-ecdsa-valid-cert-server-does-not-staple-v4.4-python3.9
333377
commands:

.evergreen/generated_configs/variants.yml

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,66 @@
11
buildvariants:
22
# Alternative hosts tests
3-
- name: openssl-1.0.2-rhel7
3+
- name: openssl-1.0.2-rhel7-v5.0-python3.9
44
tasks:
5-
- name: .standard .server-5.0
6-
display_name: OpenSSL 1.0.2 RHEL7
5+
- name: .no-toolchain
6+
display_name: OpenSSL 1.0.2 RHEL7 v5.0 Python3.9
77
run_on:
88
- rhel79-small
99
batchtime: 10080
1010
expansions:
11+
VERSION: "5.0"
12+
PYTHON_VERSION: "3.9"
1113
PYTHON_BINARY: /opt/python/3.9/bin/python3
12-
- name: other-hosts-rhel9-fips
14+
- name: other-hosts-rhel9-fips-latest
1315
tasks:
14-
- name: .standard .server-latest
15-
display_name: Other hosts RHEL9-FIPS
16+
- name: .no-toolchain
17+
display_name: Other hosts RHEL9-FIPS latest
1618
run_on:
1719
- rhel92-fips
1820
batchtime: 10080
1921
expansions:
22+
VERSION: latest
2023
NO_EXT: "1"
2124
REQUIRE_FIPS: "1"
22-
- name: other-hosts-rhel8-zseries
25+
- name: other-hosts-rhel8-zseries-latest
2326
tasks:
24-
- name: .standard .server-latest
25-
display_name: Other hosts RHEL8-zseries
27+
- name: .no-toolchain
28+
display_name: Other hosts RHEL8-zseries latest
2629
run_on:
2730
- rhel8-zseries-small
2831
batchtime: 10080
2932
expansions:
33+
VERSION: latest
3034
NO_EXT: "1"
31-
- name: other-hosts-rhel8-power8
35+
- name: other-hosts-rhel8-power8-latest
3236
tasks:
33-
- name: .standard .server-latest
34-
display_name: Other hosts RHEL8-POWER8
37+
- name: .no-toolchain
38+
display_name: Other hosts RHEL8-POWER8 latest
3539
run_on:
3640
- rhel8-power-small
3741
batchtime: 10080
3842
expansions:
43+
VERSION: latest
3944
NO_EXT: "1"
40-
- name: other-hosts-rhel8-arm64
45+
- name: other-hosts-rhel8-arm64-latest
4146
tasks:
42-
- name: .standard .server-latest
43-
display_name: Other hosts RHEL8-arm64
47+
- name: .no-toolchain
48+
display_name: Other hosts RHEL8-arm64 latest
4449
run_on:
4550
- rhel82-arm64-small
4651
batchtime: 10080
4752
expansions:
53+
VERSION: latest
4854
NO_EXT: "1"
49-
- name: other-hosts-amazon2023
55+
- name: other-hosts-amazon2023-latest
5056
tasks:
51-
- name: .standard .server-latest
52-
display_name: Other hosts Amazon2023
57+
- name: .no-toolchain
58+
display_name: Other hosts Amazon2023 latest
5359
run_on:
5460
- amazon2023-arm64-latest-large-m8g
5561
batchtime: 10080
5662
expansions:
63+
VERSION: latest
5764
NO_EXT: "1"
5865

5966
# Atlas connect tests

.evergreen/scripts/generate_config.py

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -530,26 +530,29 @@ def create_alternative_hosts_variants():
530530
variants = []
531531

532532
host = HOSTS["rhel7"]
533+
version = "5.0"
533534
variants.append(
534535
create_variant(
535-
[".standard .server-5.0"],
536-
get_variant_name("OpenSSL 1.0.2", host),
536+
[".no-toolchain"],
537+
get_variant_name("OpenSSL 1.0.2", host, python=CPYTHONS[0], version=version),
537538
host=host,
538539
python=CPYTHONS[0],
539540
batchtime=batchtime,
541+
expansions=dict(VERSION=version, PYTHON_VERSION=CPYTHONS[0]),
540542
)
541543
)
542544

545+
version = "latest"
543546
for host_name in OTHER_HOSTS:
544-
expansions = dict()
547+
expansions = dict(VERSION="latest")
545548
handle_c_ext(C_EXTS[0], expansions)
546549
host = HOSTS[host_name]
547550
if "fips" in host_name.lower():
548551
expansions["REQUIRE_FIPS"] = "1"
549552
variants.append(
550553
create_variant(
551-
[".standard .server-latest"],
552-
display_name=get_variant_name("Other hosts", host),
554+
[".no-toolchain"],
555+
display_name=get_variant_name("Other hosts", host, version=version),
553556
batchtime=batchtime,
554557
host=host,
555558
expansions=expansions,
@@ -595,6 +598,25 @@ def create_server_version_tasks():
595598
return tasks
596599

597600

601+
def create_no_toolchain_tasks():
602+
tasks = []
603+
604+
for topology, sync in zip_cycle(TOPOLOGIES, SYNCS):
605+
auth, ssl = get_standard_auth_ssl(topology)
606+
tags = [
607+
"no-toolchain",
608+
f"{topology}-{auth}-{ssl}",
609+
]
610+
expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
611+
name = get_task_name("test", sync=sync, **expansions)
612+
server_func = FunctionCall(func="run server", vars=expansions)
613+
test_vars = expansions.copy()
614+
test_vars["TEST_NAME"] = f"default_{sync}"
615+
test_func = FunctionCall(func="run tests", vars=test_vars)
616+
tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
617+
return tasks
618+
619+
598620
def create_test_named_tasks():
599621
"""For variants that set a TEST_NAME."""
600622
tasks = []

0 commit comments

Comments
 (0)