Skip to content

Commit bb1fbfd

Browse files
committed
combine topo auth ssl
1 parent 6f2e5f1 commit bb1fbfd

File tree

2 files changed

+18
-103
lines changed

2 files changed

+18
-103
lines changed

.evergreen/generated_configs/tasks.yml

Lines changed: 17 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -8047,12 +8047,7 @@ tasks:
80478047
TOPOLOGY: sharded_cluster
80488048
COVERAGE: "1"
80498049
PYTHON_VERSION: "3.9"
8050-
tags:
8051-
- server-version
8052-
- "3.9"
8053-
- sharded_cluster
8054-
- auth
8055-
- ssl
8050+
tags: [server-version, "3.9", sharded_cluster-auth-ssl]
80568051
- name: test-python3.10-auth-ssl-sharded-cluster-cov
80578052
commands:
80588053
- func: run server
@@ -8068,12 +8063,7 @@ tasks:
80688063
TOPOLOGY: sharded_cluster
80698064
COVERAGE: "1"
80708065
PYTHON_VERSION: "3.10"
8071-
tags:
8072-
- server-version
8073-
- "3.10"
8074-
- sharded_cluster
8075-
- auth
8076-
- ssl
8066+
tags: [server-version, "3.10", sharded_cluster-auth-ssl]
80778067
- name: test-python3.11-auth-ssl-sharded-cluster-cov
80788068
commands:
80798069
- func: run server
@@ -8089,12 +8079,7 @@ tasks:
80898079
TOPOLOGY: sharded_cluster
80908080
COVERAGE: "1"
80918081
PYTHON_VERSION: "3.11"
8092-
tags:
8093-
- server-version
8094-
- "3.11"
8095-
- sharded_cluster
8096-
- auth
8097-
- ssl
8082+
tags: [server-version, "3.11", sharded_cluster-auth-ssl]
80988083
- name: test-python3.12-auth-ssl-sharded-cluster-cov
80998084
commands:
81008085
- func: run server
@@ -8110,12 +8095,7 @@ tasks:
81108095
TOPOLOGY: sharded_cluster
81118096
COVERAGE: "1"
81128097
PYTHON_VERSION: "3.12"
8113-
tags:
8114-
- server-version
8115-
- "3.12"
8116-
- sharded_cluster
8117-
- auth
8118-
- ssl
8098+
tags: [server-version, "3.12", sharded_cluster-auth-ssl]
81198099
- name: test-python3.13-auth-ssl-sharded-cluster-cov
81208100
commands:
81218101
- func: run server
@@ -8131,12 +8111,7 @@ tasks:
81318111
TOPOLOGY: sharded_cluster
81328112
COVERAGE: "1"
81338113
PYTHON_VERSION: "3.13"
8134-
tags:
8135-
- server-version
8136-
- "3.13"
8137-
- sharded_cluster
8138-
- auth
8139-
- ssl
8114+
tags: [server-version, "3.13", sharded_cluster-auth-ssl]
81408115
- name: test-pypy3.10-auth-ssl-sharded-cluster
81418116
commands:
81428117
- func: run server
@@ -8150,12 +8125,7 @@ tasks:
81508125
SSL: ssl
81518126
TOPOLOGY: sharded_cluster
81528127
PYTHON_VERSION: pypy3.10
8153-
tags:
8154-
- server-version
8155-
- pypy3.10
8156-
- sharded_cluster
8157-
- auth
8158-
- ssl
8128+
tags: [server-version, pypy3.10, sharded_cluster-auth-ssl]
81598129
- name: test-python3.9-auth-ssl-standalone-cov
81608130
commands:
81618131
- func: run server
@@ -8171,12 +8141,7 @@ tasks:
81718141
TOPOLOGY: standalone
81728142
COVERAGE: "1"
81738143
PYTHON_VERSION: "3.9"
8174-
tags:
8175-
- server-version
8176-
- "3.9"
8177-
- standalone
8178-
- auth
8179-
- ssl
8144+
tags: [server-version, "3.9", standalone-auth-ssl]
81808145
- name: test-python3.10-auth-nossl-standalone-cov
81818146
commands:
81828147
- func: run server
@@ -8192,12 +8157,7 @@ tasks:
81928157
TOPOLOGY: standalone
81938158
COVERAGE: "1"
81948159
PYTHON_VERSION: "3.10"
8195-
tags:
8196-
- server-version
8197-
- "3.10"
8198-
- standalone
8199-
- auth
8200-
- nossl
8160+
tags: [server-version, "3.10", standalone-auth-nossl]
82018161
- name: test-python3.11-noauth-ssl-standalone-cov
82028162
commands:
82038163
- func: run server
@@ -8213,12 +8173,7 @@ tasks:
82138173
TOPOLOGY: standalone
82148174
COVERAGE: "1"
82158175
PYTHON_VERSION: "3.11"
8216-
tags:
8217-
- server-version
8218-
- "3.11"
8219-
- standalone
8220-
- noauth
8221-
- ssl
8176+
tags: [server-version, "3.11", standalone-noauth-ssl]
82228177
- name: test-python3.12-noauth-nossl-standalone-cov
82238178
commands:
82248179
- func: run server
@@ -8234,12 +8189,7 @@ tasks:
82348189
TOPOLOGY: standalone
82358190
COVERAGE: "1"
82368191
PYTHON_VERSION: "3.12"
8237-
tags:
8238-
- server-version
8239-
- "3.12"
8240-
- standalone
8241-
- noauth
8242-
- nossl
8192+
tags: [server-version, "3.12", standalone-noauth-nossl]
82438193
- name: test-python3.13-auth-ssl-replica-set-cov
82448194
commands:
82458195
- func: run server
@@ -8255,12 +8205,7 @@ tasks:
82558205
TOPOLOGY: replica_set
82568206
COVERAGE: "1"
82578207
PYTHON_VERSION: "3.13"
8258-
tags:
8259-
- server-version
8260-
- "3.13"
8261-
- replica_set
8262-
- auth
8263-
- ssl
8208+
tags: [server-version, "3.13", replica_set-auth-ssl]
82648209
- name: test-pypy3.10-auth-nossl-replica-set
82658210
commands:
82668211
- func: run server
@@ -8274,12 +8219,7 @@ tasks:
82748219
SSL: nossl
82758220
TOPOLOGY: replica_set
82768221
PYTHON_VERSION: pypy3.10
8277-
tags:
8278-
- server-version
8279-
- pypy3.10
8280-
- replica_set
8281-
- auth
8282-
- nossl
8222+
tags: [server-version, pypy3.10, replica_set-auth-nossl]
82838223
- name: test-python3.9-noauth-ssl-replica-set-cov
82848224
commands:
82858225
- func: run server
@@ -8295,12 +8235,7 @@ tasks:
82958235
TOPOLOGY: replica_set
82968236
COVERAGE: "1"
82978237
PYTHON_VERSION: "3.9"
8298-
tags:
8299-
- server-version
8300-
- "3.9"
8301-
- replica_set
8302-
- noauth
8303-
- ssl
8238+
tags: [server-version, "3.9", replica_set-noauth-ssl]
83048239
- name: test-python3.10-noauth-nossl-replica-set-cov
83058240
commands:
83068241
- func: run server
@@ -8316,12 +8251,7 @@ tasks:
83168251
TOPOLOGY: replica_set
83178252
COVERAGE: "1"
83188253
PYTHON_VERSION: "3.10"
8319-
tags:
8320-
- server-version
8321-
- "3.10"
8322-
- replica_set
8323-
- noauth
8324-
- nossl
8254+
tags: [server-version, "3.10", replica_set-noauth-nossl]
83258255
- name: test-python3.12-auth-nossl-sharded-cluster-cov
83268256
commands:
83278257
- func: run server
@@ -8337,12 +8267,7 @@ tasks:
83378267
TOPOLOGY: sharded_cluster
83388268
COVERAGE: "1"
83398269
PYTHON_VERSION: "3.12"
8340-
tags:
8341-
- server-version
8342-
- "3.12"
8343-
- sharded_cluster
8344-
- auth
8345-
- nossl
8270+
tags: [server-version, "3.12", sharded_cluster-auth-nossl]
83468271
- name: test-python3.13-noauth-ssl-sharded-cluster-cov
83478272
commands:
83488273
- func: run server
@@ -8358,12 +8283,7 @@ tasks:
83588283
TOPOLOGY: sharded_cluster
83598284
COVERAGE: "1"
83608285
PYTHON_VERSION: "3.13"
8361-
tags:
8362-
- server-version
8363-
- "3.13"
8364-
- sharded_cluster
8365-
- noauth
8366-
- ssl
8286+
tags: [server-version, "3.13", sharded_cluster-noauth-ssl]
83678287
- name: test-pypy3.10-noauth-nossl-sharded-cluster
83688288
commands:
83698289
- func: run server
@@ -8377,12 +8297,7 @@ tasks:
83778297
SSL: nossl
83788298
TOPOLOGY: sharded_cluster
83798299
PYTHON_VERSION: pypy3.10
8380-
tags:
8381-
- server-version
8382-
- pypy3.10
8383-
- sharded_cluster
8384-
- noauth
8385-
- nossl
8300+
tags: [server-version, pypy3.10, sharded_cluster-noauth-nossl]
83868301

83878302
# Serverless tests
83888303
- name: test-serverless

.evergreen/scripts/generate_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ def create_server_version_tasks():
591591
continue
592592
task_types.append((python, topology, auth, ssl))
593593
for python, topology, auth, ssl in task_types:
594-
tags = ["server-version", python, topology, auth, ssl]
594+
tags = ["server-version", python, f"{topology}-{auth}-{ssl}"]
595595
expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
596596
if python not in PYPYS:
597597
expansions["COVERAGE"] = "1"

0 commit comments

Comments
 (0)