Skip to content

chore(e2e): lower bound e2e tests #6995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ const PACKAGE_BUILD_VARIANTS = [

const TEST_PACKAGED_APP_BUILD_VARIANTS = [
{
name: 'test-packaged-app-ubuntu',
display_name: 'Ubuntu 20.04',
name: 'test-packaged-app-ubuntu-ttfq',
display_name: 'Ubuntu 20.04 (time-to-first-query)',
run_on: 'ubuntu2004-large',
depends_on: 'package-ubuntu',
time_to_first_query: true,
},
{
name: 'test-packaged-app-windows',
Expand All @@ -74,23 +75,26 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
depends_on: 'package-windows',
},
{
name: 'test-packaged-app-rhel',
display_name: 'RHEL 8.0',
name: 'test-packaged-app-rhel-ttfq',
display_name: 'RHEL 8.0 (time-to-first-query)',
run_on: 'rhel80-large',
depends_on: 'package-rhel',
time_to_first_query: true,
},
{
name: 'test-packaged-app-macos-11-arm',
display_name: 'MacOS arm64 11',
name: 'test-packaged-app-macos-11-arm-ttfq',
display_name: 'MacOS arm64 11 (time-to-first-query)',
run_on: 'macos-11-arm64-gui',
depends_on: 'package-macos-arm'
depends_on: 'package-macos-arm',
time_to_first_query: true,
},
{
name: 'test-packaged-app-macos-11-x64',
display_name: 'MacOS x64 11',
name: 'test-packaged-app-macos-11-x64-ttfq',
display_name: 'MacOS x64 11 (time-to-first-query)',
run_on: 'macos-11-gui',
patchable: false,
depends_on: 'package-macos-x64'
depends_on: 'package-macos-x64',
time_to_first_query: true,
},
{
name: 'test-packaged-app-macos-14-arm',
Expand Down Expand Up @@ -243,10 +247,10 @@ buildvariants:
- name: package-compass
variant: <%= buildVariant.depends_on %>
tasks:
<% for (const group of E2E_TEST_GROUPS) { %>
<% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %>
- name: test-packaged-app-macos13-<%= group.number %>
<% if (buildVariant.time_to_first_query) { %>
- name: test-packaged-app-time-to-first-query
<% } else { %>
<% for (const group of E2E_TEST_GROUPS) { %>
- name: test-packaged-app-<%= group.number %>
<% } %>
<% } %>
Expand Down Expand Up @@ -507,8 +511,9 @@ tasks:
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
<% } %>

- name: test-packaged-app-macos13-<%= group.number %>
- name: test-packaged-app-time-to-first-query
tags:
- required-for-publish
- run-on-pr
Expand All @@ -530,10 +535,8 @@ tasks:
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
e2e_test_filter: time-to-first-query
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
<% } %>

<% for (const browser of BROWSERS) { %>
<% for(const group of E2E_TEST_GROUPS) { %>
Expand Down
87 changes: 14 additions & 73 deletions .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,15 @@ buildvariants:
- name: test-server-latest-alpha-1
- name: test-server-latest-alpha-2
- name: test-server-latest-alpha-3
- name: test-packaged-app-ubuntu
display_name: Test Packaged App Ubuntu 20.04
- name: test-packaged-app-ubuntu-ttfq
display_name: Test Packaged App Ubuntu 20.04 (time-to-first-query)
run_on: ubuntu2004-large
patchable: true
depends_on:
- name: package-compass
variant: package-ubuntu
tasks:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-time-to-first-query
- name: test-packaged-app-windows
display_name: Test Packaged App Windows 10
run_on: windows-vsCurrent-large
Expand All @@ -191,39 +189,33 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-rhel
display_name: Test Packaged App RHEL 8.0
- name: test-packaged-app-rhel-ttfq
display_name: Test Packaged App RHEL 8.0 (time-to-first-query)
run_on: rhel80-large
patchable: true
depends_on:
- name: package-compass
variant: package-rhel
tasks:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-11-arm
display_name: Test Packaged App MacOS arm64 11
- name: test-packaged-app-time-to-first-query
- name: test-packaged-app-macos-11-arm-ttfq
display_name: Test Packaged App MacOS arm64 11 (time-to-first-query)
run_on: macos-11-arm64-gui
patchable: true
depends_on:
- name: package-compass
variant: package-macos-arm
tasks:
- name: test-packaged-app-macos13-1
- name: test-packaged-app-macos13-2
- name: test-packaged-app-macos13-3
- name: test-packaged-app-macos-11-x64
display_name: Test Packaged App MacOS x64 11
- name: test-packaged-app-time-to-first-query
- name: test-packaged-app-macos-11-x64-ttfq
display_name: Test Packaged App MacOS x64 11 (time-to-first-query)
run_on: macos-11-gui
patchable: false
depends_on:
- name: package-compass
variant: package-macos-x64
tasks:
- name: test-packaged-app-macos13-1
- name: test-packaged-app-macos13-2
- name: test-packaged-app-macos13-3
- name: test-packaged-app-time-to-first-query
- name: test-packaged-app-macos-14-arm
display_name: Test Packaged App MacOS arm64 14
run_on: macos-14-arm64-gui
Expand Down Expand Up @@ -1294,31 +1286,6 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos13-1
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-2
tags:
- required-for-publish
Expand All @@ -1344,31 +1311,6 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos13-2
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-3
tags:
- required-for-publish
Expand All @@ -1394,7 +1336,7 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos13-3
- name: test-packaged-app-time-to-first-query
tags:
- required-for-publish
- run-on-pr
Expand All @@ -1416,8 +1358,7 @@ tasks:
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
e2e_test_filter: time-to-first-query
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-web-sandbox-chrome-1
tags:
Expand Down
13 changes: 7 additions & 6 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -606,8 +606,8 @@ functions:
DEBUG: ${debug|}
MONGODB_VERSION: ${mongodb_version|}
MONGODB_RUNNER_VERSION: ${mongodb_version|}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups|1}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group|1}
ATLAS_LOCAL_VERSION: latest
script: |
set -e
Expand Down Expand Up @@ -638,8 +638,9 @@ functions:
DEBUG: ${debug|}
MONGODB_VERSION: ${mongodb_version|}
MONGODB_RUNNER_VERSION: ${mongodb_version|}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups|1}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group|1}
COMPASS_E2E_TEST_FILTER: ${e2e_test_filter|}
script: |
set -e
# Load environment variables
Expand Down Expand Up @@ -720,8 +721,8 @@ functions:
MONGODB_VERSION: ${mongodb_version|}
MONGODB_RUNNER_VERSION: ${mongodb_version|}
COMPASS_E2E_BROWSER_NAME: ${browser_name}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups|1}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group|1}
script: |
set -e
# Load environment variables
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ function buildCommonArgs(yargs: Argv) {
type: 'string',
description: 'Filter the spec files picked up for testing',
default: '*',
coerce: (arg) => (arg === '' ? '*' : arg),
})
.option('webdriver-waitfor-timeout', {
type: 'number',
Expand Down