Skip to content

Commit 50c459e

Browse files
mbroadstmbroadst
committed
chore(evg): mongo-orchestration compatible env names don't work
We were trying to use the same environment labels that other drivers use, but we have matching logic in the test runner that still depends on our legacy names.
1 parent 969ed32 commit 50c459e

File tree

2 files changed

+75
-75
lines changed

2 files changed

+75
-75
lines changed

‎.evergreen/config.yml

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -139,26 +139,26 @@ tasks:
139139
vars:
140140
VERSION: latest
141141
TOPOLOGY: server
142-
- name: test-latest-replica_set
142+
- name: test-latest-replicaset
143143
tags:
144144
- latest
145-
- replica_set
145+
- replicaset
146146
commands:
147147
- func: install dependencies
148148
- func: run tests
149149
vars:
150150
VERSION: latest
151-
TOPOLOGY: replica_set
152-
- name: test-latest-sharded_cluster
151+
TOPOLOGY: replicaset
152+
- name: test-latest-sharded
153153
tags:
154154
- latest
155-
- sharded_cluster
155+
- sharded
156156
commands:
157157
- func: install dependencies
158158
- func: run tests
159159
vars:
160160
VERSION: latest
161-
TOPOLOGY: sharded_cluster
161+
TOPOLOGY: sharded
162162
- name: test-4.0-server
163163
tags:
164164
- '4.0'
@@ -169,26 +169,26 @@ tasks:
169169
vars:
170170
VERSION: '4.0'
171171
TOPOLOGY: server
172-
- name: test-4.0-replica_set
172+
- name: test-4.0-replicaset
173173
tags:
174174
- '4.0'
175-
- replica_set
175+
- replicaset
176176
commands:
177177
- func: install dependencies
178178
- func: run tests
179179
vars:
180180
VERSION: '4.0'
181-
TOPOLOGY: replica_set
182-
- name: test-4.0-sharded_cluster
181+
TOPOLOGY: replicaset
182+
- name: test-4.0-sharded
183183
tags:
184184
- '4.0'
185-
- sharded_cluster
185+
- sharded
186186
commands:
187187
- func: install dependencies
188188
- func: run tests
189189
vars:
190190
VERSION: '4.0'
191-
TOPOLOGY: sharded_cluster
191+
TOPOLOGY: sharded
192192
- name: test-3.6-server
193193
tags:
194194
- '3.6'
@@ -199,26 +199,26 @@ tasks:
199199
vars:
200200
VERSION: '3.6'
201201
TOPOLOGY: server
202-
- name: test-3.6-replica_set
202+
- name: test-3.6-replicaset
203203
tags:
204204
- '3.6'
205-
- replica_set
205+
- replicaset
206206
commands:
207207
- func: install dependencies
208208
- func: run tests
209209
vars:
210210
VERSION: '3.6'
211-
TOPOLOGY: replica_set
212-
- name: test-3.6-sharded_cluster
211+
TOPOLOGY: replicaset
212+
- name: test-3.6-sharded
213213
tags:
214214
- '3.6'
215-
- sharded_cluster
215+
- sharded
216216
commands:
217217
- func: install dependencies
218218
- func: run tests
219219
vars:
220220
VERSION: '3.6'
221-
TOPOLOGY: sharded_cluster
221+
TOPOLOGY: sharded
222222
- name: test-3.4-server
223223
tags:
224224
- '3.4'
@@ -229,26 +229,26 @@ tasks:
229229
vars:
230230
VERSION: '3.4'
231231
TOPOLOGY: server
232-
- name: test-3.4-replica_set
232+
- name: test-3.4-replicaset
233233
tags:
234234
- '3.4'
235-
- replica_set
235+
- replicaset
236236
commands:
237237
- func: install dependencies
238238
- func: run tests
239239
vars:
240240
VERSION: '3.4'
241-
TOPOLOGY: replica_set
242-
- name: test-3.4-sharded_cluster
241+
TOPOLOGY: replicaset
242+
- name: test-3.4-sharded
243243
tags:
244244
- '3.4'
245-
- sharded_cluster
245+
- sharded
246246
commands:
247247
- func: install dependencies
248248
- func: run tests
249249
vars:
250250
VERSION: '3.4'
251-
TOPOLOGY: sharded_cluster
251+
TOPOLOGY: sharded
252252
- name: test-3.2-server
253253
tags:
254254
- '3.2'
@@ -259,26 +259,26 @@ tasks:
259259
vars:
260260
VERSION: '3.2'
261261
TOPOLOGY: server
262-
- name: test-3.2-replica_set
262+
- name: test-3.2-replicaset
263263
tags:
264264
- '3.2'
265-
- replica_set
265+
- replicaset
266266
commands:
267267
- func: install dependencies
268268
- func: run tests
269269
vars:
270270
VERSION: '3.2'
271-
TOPOLOGY: replica_set
272-
- name: test-3.2-sharded_cluster
271+
TOPOLOGY: replicaset
272+
- name: test-3.2-sharded
273273
tags:
274274
- '3.2'
275-
- sharded_cluster
275+
- sharded
276276
commands:
277277
- func: install dependencies
278278
- func: run tests
279279
vars:
280280
VERSION: '3.2'
281-
TOPOLOGY: sharded_cluster
281+
TOPOLOGY: sharded
282282
- name: test-3.0-server
283283
tags:
284284
- '3.0'
@@ -289,26 +289,26 @@ tasks:
289289
vars:
290290
VERSION: '3.0'
291291
TOPOLOGY: server
292-
- name: test-3.0-replica_set
292+
- name: test-3.0-replicaset
293293
tags:
294294
- '3.0'
295-
- replica_set
295+
- replicaset
296296
commands:
297297
- func: install dependencies
298298
- func: run tests
299299
vars:
300300
VERSION: '3.0'
301-
TOPOLOGY: replica_set
302-
- name: test-3.0-sharded_cluster
301+
TOPOLOGY: replicaset
302+
- name: test-3.0-sharded
303303
tags:
304304
- '3.0'
305-
- sharded_cluster
305+
- sharded
306306
commands:
307307
- func: install dependencies
308308
- func: run tests
309309
vars:
310310
VERSION: '3.0'
311-
TOPOLOGY: sharded_cluster
311+
TOPOLOGY: sharded
312312
- name: test-2.6-server
313313
tags:
314314
- '2.6'
@@ -319,26 +319,26 @@ tasks:
319319
vars:
320320
VERSION: '2.6'
321321
TOPOLOGY: server
322-
- name: test-2.6-replica_set
322+
- name: test-2.6-replicaset
323323
tags:
324324
- '2.6'
325-
- replica_set
325+
- replicaset
326326
commands:
327327
- func: install dependencies
328328
- func: run tests
329329
vars:
330330
VERSION: '2.6'
331-
TOPOLOGY: replica_set
332-
- name: test-2.6-sharded_cluster
331+
TOPOLOGY: replicaset
332+
- name: test-2.6-sharded
333333
tags:
334334
- '2.6'
335-
- sharded_cluster
335+
- sharded
336336
commands:
337337
- func: install dependencies
338338
- func: run tests
339339
vars:
340340
VERSION: '2.6'
341-
TOPOLOGY: sharded_cluster
341+
TOPOLOGY: sharded
342342
- name: test-atlas-connectivity
343343
tags:
344344
- atlas-connect
@@ -355,26 +355,26 @@ buildvariants:
355355
NODE_LTS_NAME: dubnium
356356
tasks: &ref_0
357357
- test-latest-server
358-
- test-latest-replica_set
359-
- test-latest-sharded_cluster
358+
- test-latest-replicaset
359+
- test-latest-sharded
360360
- test-4.0-server
361-
- test-4.0-replica_set
362-
- test-4.0-sharded_cluster
361+
- test-4.0-replicaset
362+
- test-4.0-sharded
363363
- test-3.6-server
364-
- test-3.6-replica_set
365-
- test-3.6-sharded_cluster
364+
- test-3.6-replicaset
365+
- test-3.6-sharded
366366
- test-3.4-server
367-
- test-3.4-replica_set
368-
- test-3.4-sharded_cluster
367+
- test-3.4-replicaset
368+
- test-3.4-sharded
369369
- test-3.2-server
370-
- test-3.2-replica_set
371-
- test-3.2-sharded_cluster
370+
- test-3.2-replicaset
371+
- test-3.2-sharded
372372
- test-3.0-server
373-
- test-3.0-replica_set
374-
- test-3.0-sharded_cluster
373+
- test-3.0-replicaset
374+
- test-3.0-sharded
375375
- test-2.6-server
376-
- test-2.6-replica_set
377-
- test-2.6-sharded_cluster
376+
- test-2.6-replicaset
377+
- test-2.6-sharded
378378
- test-atlas-connectivity
379379
- name: linux-64-amzn-test-carbon
380380
display_name: Amazon Linux (Enterprise) Node Carbon
@@ -521,20 +521,20 @@ buildvariants:
521521
NODE_LTS_NAME: dubnium
522522
tasks: &ref_1
523523
- test-latest-server
524-
- test-latest-replica_set
525-
- test-latest-sharded_cluster
524+
- test-latest-replicaset
525+
- test-latest-sharded
526526
- test-4.0-server
527-
- test-4.0-replica_set
528-
- test-4.0-sharded_cluster
527+
- test-4.0-replicaset
528+
- test-4.0-sharded
529529
- test-3.6-server
530-
- test-3.6-replica_set
531-
- test-3.6-sharded_cluster
530+
- test-3.6-replicaset
531+
- test-3.6-sharded
532532
- test-3.4-server
533-
- test-3.4-replica_set
534-
- test-3.4-sharded_cluster
533+
- test-3.4-replicaset
534+
- test-3.4-sharded
535535
- test-3.2-server
536-
- test-3.2-replica_set
537-
- test-3.2-sharded_cluster
536+
- test-3.2-replicaset
537+
- test-3.2-sharded
538538
- test-atlas-connectivity
539539
- name: ubuntu-16.04-carbon
540540
display_name: Ubuntu 16.04 Node Carbon
@@ -609,17 +609,17 @@ buildvariants:
609609
NODE_LTS_NAME: dubnium
610610
tasks: &ref_2
611611
- test-latest-server
612-
- test-latest-replica_set
613-
- test-latest-sharded_cluster
612+
- test-latest-replicaset
613+
- test-latest-sharded
614614
- test-4.0-server
615-
- test-4.0-replica_set
616-
- test-4.0-sharded_cluster
615+
- test-4.0-replicaset
616+
- test-4.0-sharded
617617
- test-3.6-server
618-
- test-3.6-replica_set
619-
- test-3.6-sharded_cluster
618+
- test-3.6-replicaset
619+
- test-3.6-sharded
620620
- test-3.4-server
621-
- test-3.4-replica_set
622-
- test-3.4-sharded_cluster
621+
- test-3.4-replicaset
622+
- test-3.4-sharded
623623
- test-atlas-connectivity
624624
- name: debian81-test-carbon
625625
display_name: Debian 8.1 Node Carbon

‎.evergreen/generate_evergreen_tasks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const yaml = require('js-yaml');
66

77
const MONGODB_VERSIONS = ['latest', '4.0', '3.6', '3.4', '3.2', '3.0', '2.6'];
88
const NODE_VERSIONS = ['dubnium', 'carbon', 'boron', 'argon'];
9-
const TOPOLOGIES = ['server', 'replica_set', 'sharded_cluster'];
9+
const TOPOLOGIES = ['server', 'replicaset', 'sharded'];
1010
const OPERATING_SYSTEMS = [
1111
{
1212
name: 'linux-64-amzn-test',

0 commit comments

Comments
 (0)