Skip to content
Open
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
38 changes: 18 additions & 20 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14362,14 +14362,14 @@ buildvariants:
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_linux_arm64_openssl3
- name: e2e_tests_ubuntu2404_arm64_small_openssl3_m820-rc4
display_name: "Ubuntu 24.04 arm64 820-rc4 openssl3 (E2E tests)"
- name: e2e_tests_ubuntu2404_arm64_small_openssl3_m82x
display_name: "Ubuntu 24.04 arm64 82x openssl3 (E2E tests)"
run_on: ubuntu2404-arm64-small
tags: []
expansions:
executable_os_id: "linux-arm64-openssl3"
node_js_version: "20.19.6"
mongosh_server_test_version: "8.2.0-rc4-enterprise"
mongosh_server_test_version: "8.2.x-enterprise"
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_linux_arm64_openssl3
Expand All @@ -14395,14 +14395,14 @@ buildvariants:
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_linux_arm64
- name: e2e_tests_amazon2023.0_arm64_small_m820-rc4
display_name: "Amazon Linux 2023 arm64 820-rc4 (E2E tests)"
- name: e2e_tests_amazon2023.0_arm64_small_m82x
display_name: "Amazon Linux 2023 arm64 82x (E2E tests)"
run_on: amazon2023.0-arm64-small
tags: []
expansions:
executable_os_id: "linux-arm64"
node_js_version: "20.19.6"
mongosh_server_test_version: "8.2.0-rc4-enterprise"
mongosh_server_test_version: "8.2.x-enterprise"
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_linux_arm64
Expand Down Expand Up @@ -14483,14 +14483,14 @@ buildvariants:
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_linux_ppc64le
- name: e2e_tests_rhel9_power_small_m820-rc4
display_name: "RHEL 9 PPC 820-rc4 (E2E tests)"
- name: e2e_tests_rhel9_power_small_m82x
display_name: "RHEL 9 PPC 82x (E2E tests)"
run_on: rhel9-power-small
tags: []
expansions:
executable_os_id: "linux-ppc64le"
node_js_version: "20.19.6"
mongosh_server_test_version: "8.2.0-rc4-enterprise"
mongosh_server_test_version: "8.2.x-enterprise"
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_linux_ppc64le
Expand Down Expand Up @@ -14527,14 +14527,14 @@ buildvariants:
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_linux_s390x
- name: e2e_tests_rhel9_zseries_small_m820-rc4
display_name: "RHEL 9 s390x 820-rc4 (E2E tests)"
- name: e2e_tests_rhel9_zseries_small_m82x
display_name: "RHEL 9 s390x 82x (E2E tests)"
run_on: rhel9-zseries-small
tags: []
expansions:
executable_os_id: "linux-s390x"
node_js_version: "20.19.6"
mongosh_server_test_version: "8.2.0-rc4-enterprise"
mongosh_server_test_version: "8.2.x-enterprise"
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_linux_s390x
Expand All @@ -14560,14 +14560,14 @@ buildvariants:
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_darwin_arm64
- name: e2e_tests_macos_14_arm64_m820-rc4
display_name: "MacOS 14 arm64 820-rc4 (E2E tests)"
- name: e2e_tests_macos_14_arm64_m82x
display_name: "MacOS 14 arm64 82x (E2E tests)"
run_on: macos-14-arm64
tags: []
expansions:
executable_os_id: "darwin-arm64"
node_js_version: "20.19.6"
mongosh_server_test_version: "8.2.0-rc4-enterprise"
mongosh_server_test_version: "8.2.x-enterprise"
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_darwin_arm64
Expand Down Expand Up @@ -14610,19 +14610,17 @@ buildvariants:
- name: e2e_tests_win32
- name: package_artifact_win32_x64
- name: package_artifact_win32msi_x64
- name: e2e_tests_windows_vsCurrent_small_m820-rc4
display_name: "Windows VS 2022 820-rc4 (E2E tests)"
- name: e2e_tests_windows_vsCurrent_small_m82x
display_name: "Windows VS 2022 82x (E2E tests)"
run_on: windows-vsCurrent-small
tags: []
expansions:
executable_os_id: "win32"
node_js_version: "20.19.6"
mongosh_server_test_version: "8.2.0-rc4-enterprise"
mongosh_server_test_version: "8.2.x-enterprise"
mongosh_test_e2e_force_fips: ""
tasks:
- name: e2e_tests_win32
- name: package_artifact_win32_x64
- name: package_artifact_win32msi_x64
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

(mainly noticed this because I saw we were packaging twice for windows)


- name: linux_compile
display_name: "Ubuntu 20.04 x64 (Compile and Check)"
Expand Down
16 changes: 6 additions & 10 deletions .evergreen/build-variants/e2e-tests-build-variants.js
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
runOn: 'ubuntu2404-arm64-small',
sharedOpenSsl: 'openssl3',
executableOsId: 'linux-arm64-openssl3',
mVersion: '8.2.0-rc4',
mVersion: '8.2.x',
},
{
displayName: 'Amazon Linux 2 arm64',
Expand All @@ -264,7 +264,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
displayName: 'Amazon Linux 2023 arm64',
runOn: 'amazon2023.0-arm64-small',
executableOsId: 'linux-arm64',
mVersion: '8.2.0-rc4',
mVersion: '8.2.x',
},
{
displayName: 'RHEL 8.2 arm64',
Expand Down Expand Up @@ -314,7 +314,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
displayName: 'RHEL 9 PPC',
runOn: 'rhel9-power-small',
executableOsId: 'linux-ppc64le',
mVersion: '8.2.0-rc4',
mVersion: '8.2.x',
},
{
displayName: 'RHEL 7 s390x',
Expand All @@ -338,7 +338,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
displayName: 'RHEL 9 s390x',
runOn: 'rhel9-zseries-small',
executableOsId: 'linux-s390x',
mVersion: '8.2.0-rc4',
mVersion: '8.2.x',
},
{
displayName: 'MacOS 14 x64',
Expand All @@ -356,7 +356,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
displayName: 'MacOS 14 arm64',
runOn: 'macos-14-arm64',
executableOsId: 'darwin-arm64',
mVersion: '8.2.0-rc4',
mVersion: '8.2.x',
},
{
displayName: 'MacOS Big Sur',
Expand Down Expand Up @@ -392,11 +392,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
displayName: 'Windows VS 2022',
runOn: 'windows-vsCurrent-small',
executableOsId: 'win32',
mVersion: '8.2.0-rc4',
additionalTasks: [
'package_artifact_win32_x64',
'package_artifact_win32msi_x64',
],
mVersion: '8.2.x'
},
].map((buildVariant) => {
const { displayName, fips, sharedOpenSsl, mVersion, runOn, executableOsId } =
Expand Down
Loading