Skip to content
Merged
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
16 changes: 12 additions & 4 deletions .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ const MAINTAINED_SERVER_VERSIONS = [
{ name: '80x-enterprise', version: '8.0.x-enterprise' },
];

const LATEST_MAINTAINED_SERVER_VERSION =
MAINTAINED_SERVER_VERSIONS[MAINTAINED_SERVER_VERSIONS.length - 1];
Comment on lines +163 to +164
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really mind keeping it as latest-stable, but this will not be aligned with our support policy (and we know it will start causing issues soon), so makes sense to me to use MAINTAINED_SERVER_VERSIONS as a source


const TEST_LATEST_ALPHA_SERVER_VERSION = { name: 'latest-alpha', version: 'latest-alpha-enterprise' };

const SERVER_VERSIONS = [
Expand Down Expand Up @@ -222,7 +225,7 @@ buildvariants:
- name: package-<%= distribution %>
variant: <%= buildVariant.depends_on %>
tasks:
- name: smoketest-<%= distribution %>
- name: smoketest-<%= distribution %>
<% } %>
<% } %>

Expand Down Expand Up @@ -357,6 +360,7 @@ tasks:
- func: test
vars:
debug: 'hadron*,mongo*'
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>

- name: test-electron
tags: ['required-for-publish', 'run-on-pr']
Expand All @@ -367,6 +371,7 @@ tasks:
- func: test-electron
vars:
debug: 'hadron*,mongo*'
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>

- name: test-connectivity
tags: ['required-for-publish', 'run-on-pr']
Expand All @@ -375,6 +380,7 @@ tasks:
- func: test-connectivity
vars:
debug: 'compass*,electron*,hadron*,mongo*'
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>

- name: test-csfle
tags: ['required-for-publish', 'run-on-pr']
Expand All @@ -385,6 +391,7 @@ tasks:
- func: test-csfle
vars:
debug: 'compass*,electron*,hadron*,mongo*'
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>

<% for(const group of E2E_TEST_GROUPS) { %>
- name: e2e-coverage-<%= group.number %>
Expand All @@ -398,6 +405,7 @@ tasks:
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
<% } %>

- name: generate-vulnerability-report
Expand Down Expand Up @@ -471,7 +479,7 @@ tasks:
scope: 'compass-e2e-tests'
- func: smoketest-packaged-app
vars:
mongodb_version: latest-enterprise
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
compass_distribution: <%= distribution %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
<% } %>
Expand Down Expand Up @@ -525,7 +533,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: latest-enterprise
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
compass_distribution: compass
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
Expand All @@ -551,7 +559,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest-enterprise
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
browser_name: '<%= browser %>'
compass_distribution: compass
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
Expand Down
27 changes: 17 additions & 10 deletions .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ tasks:
- func: test
vars:
debug: hadron*,mongo*
mongodb_version: 8.0.x-enterprise
- name: test-electron
tags:
- required-for-publish
Expand All @@ -324,6 +325,7 @@ tasks:
- func: test-electron
vars:
debug: hadron*,mongo*
mongodb_version: 8.0.x-enterprise
- name: test-connectivity
tags:
- required-for-publish
Expand All @@ -333,6 +335,7 @@ tasks:
- func: test-connectivity
vars:
debug: compass*,electron*,hadron*,mongo*
mongodb_version: 8.0.x-enterprise
- name: test-csfle
tags:
- required-for-publish
Expand All @@ -344,6 +347,7 @@ tasks:
- func: test-csfle
vars:
debug: compass*,electron*,hadron*,mongo*
mongodb_version: 8.0.x-enterprise
- name: e2e-coverage-1
tags:
- required-for-publish
Expand All @@ -357,6 +361,7 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: 8.0.x-enterprise
- name: e2e-coverage-2
tags:
- required-for-publish
Expand All @@ -370,6 +375,7 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: 8.0.x-enterprise
- name: e2e-coverage-3
tags:
- required-for-publish
Expand All @@ -383,6 +389,7 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: 8.0.x-enterprise
- name: generate-vulnerability-report
tags:
- required-for-publish
Expand Down Expand Up @@ -497,7 +504,7 @@ tasks:
scope: compass-e2e-tests
- func: smoketest-packaged-app
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-server-40x-community-1
Expand Down Expand Up @@ -1555,7 +1562,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
Expand All @@ -1580,7 +1587,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
Expand All @@ -1605,7 +1612,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
Expand All @@ -1627,7 +1634,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
browser_name: chrome
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1650,7 +1657,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
browser_name: chrome
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1673,7 +1680,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
browser_name: chrome
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1696,7 +1703,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
browser_name: firefox
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1719,7 +1726,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
browser_name: firefox
compass_distribution: compass
e2e_test_groups: 3
Expand All @@ -1742,7 +1749,7 @@ tasks:
compass_distribution: compass
- func: test-web-sandbox
vars:
mongodb_version: latest-enterprise
mongodb_version: 8.0.x-enterprise
browser_name: firefox
compass_distribution: compass
e2e_test_groups: 3
Expand Down
5 changes: 1 addition & 4 deletions .evergreen/print-compass-env.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@ function printCompassEnv() {
printVar('IS_RHEL', process.env.IS_RHEL);
printVar('IS_UBUNTU', process.env.IS_UBUNTU);
printVar('DEBUG', process.env.DEBUG);
printVar(
'MONGODB_VERSION',
process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION
);
printVar('MONGODB_VERSION', process.env.MONGODB_VERSION);
printVar('DEV_VERSION_IDENTIFIER', process.env.DEV_VERSION_IDENTIFIER);
printVar('EVERGREEN_REVISION', process.env.EVERGREEN_REVISION);
printVar(
Expand Down
2 changes: 0 additions & 2 deletions .evergreen/print-compass-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

set -e

export MONGODB_DEFAULT_VERSION=7.0.x

if [[ $OSTYPE == "cygwin" ]]; then
export PLATFORM='win32'
export IS_WINDOWS=true
Expand Down
Loading