Skip to content

Commit 15f8903

Browse files
kraenhansenkraenhansen
committed
Limit tests on old platforms to time-to-first-query
1 parent 6403131 commit 15f8903

File tree

2 files changed

+34
-90
lines changed

2 files changed

+34
-90
lines changed

‎.evergreen/buildvariants-and-tasks.in.yml‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ const PACKAGE_BUILD_VARIANTS = [
6262
6363
const TEST_PACKAGED_APP_BUILD_VARIANTS = [
6464
{
65-
name: 'test-packaged-app-ubuntu',
66-
display_name: 'Ubuntu 20.04',
65+
name: 'test-packaged-app-ubuntu-ttfq',
66+
display_name: 'Ubuntu 20.04 (time-to-first-query)',
6767
run_on: 'ubuntu2004-large',
6868
depends_on: 'package-ubuntu',
69+
time_to_first_query: true,
6970
},
7071
{
7172
name: 'test-packaged-app-windows',
@@ -74,23 +75,26 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
7475
depends_on: 'package-windows',
7576
},
7677
{
77-
name: 'test-packaged-app-rhel',
78-
display_name: 'RHEL 8.0',
78+
name: 'test-packaged-app-rhel-ttfq',
79+
display_name: 'RHEL 8.0 (time-to-first-query)',
7980
run_on: 'rhel80-large',
8081
depends_on: 'package-rhel',
82+
time_to_first_query: true,
8183
},
8284
{
83-
name: 'test-packaged-app-macos-11-arm',
84-
display_name: 'MacOS arm64 11',
85+
name: 'test-packaged-app-macos-11-arm-ttfq',
86+
display_name: 'MacOS arm64 11 (time-to-first-query)',
8587
run_on: 'macos-11-arm64-gui',
86-
depends_on: 'package-macos-arm'
88+
depends_on: 'package-macos-arm',
89+
time_to_first_query: true,
8790
},
8891
{
89-
name: 'test-packaged-app-macos-11-x64',
90-
display_name: 'MacOS x64 11',
92+
name: 'test-packaged-app-macos-11-x64-ttfq',
93+
display_name: 'MacOS x64 11 (time-to-first-query)',
9194
run_on: 'macos-11-gui',
9295
patchable: false,
93-
depends_on: 'package-macos-x64'
96+
depends_on: 'package-macos-x64',
97+
time_to_first_query: true,
9498
},
9599
{
96100
name: 'test-packaged-app-macos-14-arm',
@@ -243,10 +247,10 @@ buildvariants:
243247
- name: package-compass
244248
variant: <%= buildVariant.depends_on %>
245249
tasks:
246-
<% for (const group of E2E_TEST_GROUPS) { %>
247-
<% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %>
248-
- name: test-packaged-app-macos13-<%= group.number %>
250+
<% if (buildVariant.time_to_first_query) { %>
251+
- name: test-packaged-app-time-to-first-query
249252
<% } else { %>
253+
<% for (const group of E2E_TEST_GROUPS) { %>
250254
- name: test-packaged-app-<%= group.number %>
251255
<% } %>
252256
<% } %>
@@ -507,8 +511,9 @@ tasks:
507511
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
508512
e2e_test_group: <%= group.number %>
509513
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
514+
<% } %>
510515

511-
- name: test-packaged-app-macos13-<%= group.number %>
516+
- name: test-packaged-app-time-to-first-query
512517
tags:
513518
- required-for-publish
514519
- run-on-pr
@@ -530,10 +535,8 @@ tasks:
530535
vars:
531536
mongodb_version: 8.0.5
532537
compass_distribution: compass
533-
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
534-
e2e_test_group: <%= group.number %>
538+
e2e_test_filter: time-to-first-query
535539
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
536-
<% } %>
537540

538541
<% for (const browser of BROWSERS) { %>
539542
<% for(const group of E2E_TEST_GROUPS) { %>

‎.evergreen/buildvariants-and-tasks.yml‎

Lines changed: 14 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,15 @@ buildvariants:
169169
- name: test-server-latest-alpha-1
170170
- name: test-server-latest-alpha-2
171171
- name: test-server-latest-alpha-3
172-
- name: test-packaged-app-ubuntu
173-
display_name: Test Packaged App Ubuntu 20.04
172+
- name: test-packaged-app-ubuntu-ttfq
173+
display_name: Test Packaged App Ubuntu 20.04 (time-to-first-query)
174174
run_on: ubuntu2004-large
175175
patchable: true
176176
depends_on:
177177
- name: package-compass
178178
variant: package-ubuntu
179179
tasks:
180-
- name: test-packaged-app-1
181-
- name: test-packaged-app-2
182-
- name: test-packaged-app-3
180+
- name: test-packaged-app-time-to-first-query
183181
- name: test-packaged-app-windows
184182
display_name: Test Packaged App Windows 10
185183
run_on: windows-vsCurrent-large
@@ -191,39 +189,33 @@ buildvariants:
191189
- name: test-packaged-app-1
192190
- name: test-packaged-app-2
193191
- name: test-packaged-app-3
194-
- name: test-packaged-app-rhel
195-
display_name: Test Packaged App RHEL 8.0
192+
- name: test-packaged-app-rhel-ttfq
193+
display_name: Test Packaged App RHEL 8.0 (time-to-first-query)
196194
run_on: rhel80-large
197195
patchable: true
198196
depends_on:
199197
- name: package-compass
200198
variant: package-rhel
201199
tasks:
202-
- name: test-packaged-app-1
203-
- name: test-packaged-app-2
204-
- name: test-packaged-app-3
205-
- name: test-packaged-app-macos-11-arm
206-
display_name: Test Packaged App MacOS arm64 11
200+
- name: test-packaged-app-time-to-first-query
201+
- name: test-packaged-app-macos-11-arm-ttfq
202+
display_name: Test Packaged App MacOS arm64 11 (time-to-first-query)
207203
run_on: macos-11-arm64-gui
208204
patchable: true
209205
depends_on:
210206
- name: package-compass
211207
variant: package-macos-arm
212208
tasks:
213-
- name: test-packaged-app-macos13-1
214-
- name: test-packaged-app-macos13-2
215-
- name: test-packaged-app-macos13-3
216-
- name: test-packaged-app-macos-11-x64
217-
display_name: Test Packaged App MacOS x64 11
209+
- name: test-packaged-app-time-to-first-query
210+
- name: test-packaged-app-macos-11-x64-ttfq
211+
display_name: Test Packaged App MacOS x64 11 (time-to-first-query)
218212
run_on: macos-11-gui
219213
patchable: false
220214
depends_on:
221215
- name: package-compass
222216
variant: package-macos-x64
223217
tasks:
224-
- name: test-packaged-app-macos13-1
225-
- name: test-packaged-app-macos13-2
226-
- name: test-packaged-app-macos13-3
218+
- name: test-packaged-app-time-to-first-query
227219
- name: test-packaged-app-macos-14-arm
228220
display_name: Test Packaged App MacOS arm64 14
229221
run_on: macos-14-arm64-gui
@@ -1294,31 +1286,6 @@ tasks:
12941286
e2e_test_groups: 3
12951287
e2e_test_group: 1
12961288
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1297-
- name: test-packaged-app-macos13-1
1298-
tags:
1299-
- required-for-publish
1300-
- run-on-pr
1301-
- assigned_to_jira_team_compass_compass
1302-
- foliage_check_task_only
1303-
commands:
1304-
- func: prepare
1305-
- func: install
1306-
- func: bootstrap
1307-
vars:
1308-
scope: compass-e2e-tests
1309-
- func: apply-compass-target-expansion
1310-
vars:
1311-
compass_distribution: compass
1312-
- func: get-packaged-app
1313-
vars:
1314-
compass_distribution: compass
1315-
- func: test-packaged-app
1316-
vars:
1317-
mongodb_version: 8.0.5
1318-
compass_distribution: compass
1319-
e2e_test_groups: 3
1320-
e2e_test_group: 1
1321-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
13221289
- name: test-packaged-app-2
13231290
tags:
13241291
- required-for-publish
@@ -1344,31 +1311,6 @@ tasks:
13441311
e2e_test_groups: 3
13451312
e2e_test_group: 2
13461313
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1347-
- name: test-packaged-app-macos13-2
1348-
tags:
1349-
- required-for-publish
1350-
- run-on-pr
1351-
- assigned_to_jira_team_compass_compass
1352-
- foliage_check_task_only
1353-
commands:
1354-
- func: prepare
1355-
- func: install
1356-
- func: bootstrap
1357-
vars:
1358-
scope: compass-e2e-tests
1359-
- func: apply-compass-target-expansion
1360-
vars:
1361-
compass_distribution: compass
1362-
- func: get-packaged-app
1363-
vars:
1364-
compass_distribution: compass
1365-
- func: test-packaged-app
1366-
vars:
1367-
mongodb_version: 8.0.5
1368-
compass_distribution: compass
1369-
e2e_test_groups: 3
1370-
e2e_test_group: 2
1371-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
13721314
- name: test-packaged-app-3
13731315
tags:
13741316
- required-for-publish
@@ -1394,7 +1336,7 @@ tasks:
13941336
e2e_test_groups: 3
13951337
e2e_test_group: 3
13961338
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1397-
- name: test-packaged-app-macos13-3
1339+
- name: test-packaged-app-time-to-first-query
13981340
tags:
13991341
- required-for-publish
14001342
- run-on-pr
@@ -1416,8 +1358,7 @@ tasks:
14161358
vars:
14171359
mongodb_version: 8.0.5
14181360
compass_distribution: compass
1419-
e2e_test_groups: 3
1420-
e2e_test_group: 3
1361+
e2e_test_filter: time-to-first-query
14211362
debug: compass-e2e-tests*,electron*,hadron*,mongo*
14221363
- name: test-web-sandbox-chrome-1
14231364
tags:

0 commit comments

Comments
 (0)