Skip to content

Commit 0dadf4e

Browse files
committed
create tasks
1 parent 4cbb368 commit 0dadf4e

File tree

3 files changed

+68
-25
lines changed

3 files changed

+68
-25
lines changed

.evergreen/generated_configs/tasks.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3083,6 +3083,47 @@ tasks:
30833083
SUB_TEST_NAME: gke
30843084
tags: [auth_oidc, auth_oidc_remote]
30853085

3086+
# Other hosts tests
3087+
- name: test-noauth-nossl-standalone
3088+
commands:
3089+
- func: run server
3090+
vars:
3091+
AUTH: noauth
3092+
SSL: nossl
3093+
TOPOLOGY: standalone
3094+
- func: run tests
3095+
vars:
3096+
AUTH: noauth
3097+
SSL: nossl
3098+
TOPOLOGY: standalone
3099+
tags: [other-hosts, standalone-noauth-nossl]
3100+
- name: test-noauth-ssl-replica-set
3101+
commands:
3102+
- func: run server
3103+
vars:
3104+
AUTH: noauth
3105+
SSL: ssl
3106+
TOPOLOGY: replica_set
3107+
- func: run tests
3108+
vars:
3109+
AUTH: noauth
3110+
SSL: ssl
3111+
TOPOLOGY: replica_set
3112+
tags: [other-hosts, replica_set-noauth-ssl]
3113+
- name: test-auth-ssl-sharded-cluster
3114+
commands:
3115+
- func: run server
3116+
vars:
3117+
AUTH: auth
3118+
SSL: ssl
3119+
TOPOLOGY: sharded_cluster
3120+
- func: run tests
3121+
vars:
3122+
AUTH: auth
3123+
SSL: ssl
3124+
TOPOLOGY: sharded_cluster
3125+
tags: [other-hosts, sharded_cluster-auth-ssl]
3126+
30863127
# Perf tests
30873128
- name: perf-8.0-standalone-ssl
30883129
commands:

.evergreen/generated_configs/variants.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ buildvariants:
22
# Alternative hosts tests
33
- name: openssl-1.0.2-rhel7-python3.9
44
tasks:
5-
- name: .server-version .standalone-noauth-nossl
6-
- name: .server-version .replica_set-noauth-ssl
7-
- name: .server-version .sharded_cluster-auth-ssl
5+
- name: .other-hosts
86
display_name: OpenSSL 1.0.2 RHEL7 Python3.9
97
run_on:
108
- rhel79-small
@@ -15,9 +13,7 @@ buildvariants:
1513
PYTHON_BINARY: /opt/python/3.9/bin/python3
1614
- name: other-hosts-rhel9-fips
1715
tasks:
18-
- name: .server-version .standalone-noauth-nossl
19-
- name: .server-version .replica_set-noauth-ssl
20-
- name: .server-version .sharded_cluster-auth-ssl
16+
- name: .other-hosts
2117
display_name: Other hosts RHEL9-FIPS
2218
run_on:
2319
- rhel92-fips
@@ -28,9 +24,7 @@ buildvariants:
2824
REQUIRE_FIPS: "1"
2925
- name: other-hosts-rhel8-zseries
3026
tasks:
31-
- name: .server-version .standalone-noauth-nossl
32-
- name: .server-version .replica_set-noauth-ssl
33-
- name: .server-version .sharded_cluster-auth-ssl
27+
- name: .other-hosts
3428
display_name: Other hosts RHEL8-zseries
3529
run_on:
3630
- rhel8-zseries-small
@@ -40,9 +34,7 @@ buildvariants:
4034
NO_EXT: "1"
4135
- name: other-hosts-rhel8-power8
4236
tasks:
43-
- name: .server-version .standalone-noauth-nossl
44-
- name: .server-version .replica_set-noauth-ssl
45-
- name: .server-version .sharded_cluster-auth-ssl
37+
- name: .other-hosts
4638
display_name: Other hosts RHEL8-POWER8
4739
run_on:
4840
- rhel8-power-small
@@ -52,9 +44,7 @@ buildvariants:
5244
NO_EXT: "1"
5345
- name: other-hosts-rhel8-arm64
5446
tasks:
55-
- name: .server-version .standalone-noauth-nossl
56-
- name: .server-version .replica_set-noauth-ssl
57-
- name: .server-version .sharded_cluster-auth-ssl
47+
- name: .other-hosts
5848
display_name: Other hosts RHEL8-arm64
5949
run_on:
6050
- rhel82-arm64-small
@@ -64,9 +54,7 @@ buildvariants:
6454
NO_EXT: "1"
6555
- name: other-hosts-amazon2023
6656
tasks:
67-
- name: .server-version .standalone-noauth-nossl
68-
- name: .server-version .replica_set-noauth-ssl
69-
- name: .server-version .sharded_cluster-auth-ssl
57+
- name: .other-hosts
7058
display_name: Other hosts Amazon2023
7159
run_on:
7260
- amazon2023-arm64-latest-large-m8g

.evergreen/scripts/generate_config.py

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -546,16 +546,11 @@ def create_no_server_variants():
546546
def create_alternative_hosts_variants():
547547
batchtime = BATCHTIME_WEEK
548548
variants = []
549-
tags = [
550-
".server-version .standalone-noauth-nossl",
551-
".server-version .replica_set-noauth-ssl",
552-
".server-version .sharded_cluster-auth-ssl",
553-
]
554549

555550
host = HOSTS["rhel7"]
556551
variants.append(
557552
create_variant(
558-
tags,
553+
[".other-hosts"],
559554
get_variant_name("OpenSSL 1.0.2", host, python=CPYTHONS[0]),
560555
host=host,
561556
python=CPYTHONS[0],
@@ -572,7 +567,7 @@ def create_alternative_hosts_variants():
572567
expansions["REQUIRE_FIPS"] = "1"
573568
variants.append(
574569
create_variant(
575-
tags,
570+
[".other-hosts"],
576571
display_name=get_variant_name("Other hosts", host),
577572
batchtime=batchtime,
578573
host=host,
@@ -618,6 +613,25 @@ def create_server_version_tasks():
618613
return tasks
619614

620615

616+
def create_other_hosts_tasks():
617+
tasks = []
618+
619+
for topology in TOPOLOGIES:
620+
auth = "auth" if topology == "sharded_cluster" else "noauth"
621+
ssl = "nossl" if topology == "standalone" else "ssl"
622+
tags = [
623+
"other-hosts",
624+
f"{topology}-{auth}-{ssl}",
625+
]
626+
expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
627+
name = get_task_name("test", **expansions)
628+
server_func = FunctionCall(func="run server", vars=expansions)
629+
test_vars = expansions.copy()
630+
test_func = FunctionCall(func="run tests", vars=test_vars)
631+
tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
632+
return tasks
633+
634+
621635
def create_standard_linux_tasks():
622636
tasks = []
623637

0 commit comments

Comments
 (0)