Skip to content

Commit d8023e4

Browse files
committed
Share all build variants
1 parent b1e5716 commit d8023e4

File tree

2 files changed

+79
-77
lines changed

2 files changed

+79
-77
lines changed

.evergreen.yml

Lines changed: 60 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -8279,10 +8279,11 @@ tasks:
82798279
# E2E TESTS
82808280
###
82818281
# Some tests reuse the same compilation build variant, so we create those variations of tasks to set those dependencies.
8282-
- name: e2e_tests
8282+
- name: e2e_tests_build_linux_x64
82838283
tags: ["e2e-test"]
82848284
depends_on:
82858285
- name: compile_artifact
8286+
variant: build_linux_x64
82868287
commands:
82878288
- func: checkout
82888289
- func: install
@@ -8297,10 +8298,11 @@ tasks:
82978298
mongosh_server_test_version: ${mongosh_server_test_version}
82988299
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
82998300
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
8300-
- name: perf_tests
8301+
- name: perf_tests_build_linux_x64
83018302
tags: ["perf-test"]
83028303
depends_on:
83038304
- name: compile_artifact
8305+
variant: build_linux_x64
83048306
commands:
83058307
- func: checkout
83068308
- func: install
@@ -8310,11 +8312,11 @@ tasks:
83108312
vars:
83118313
executable_os_id: ${executable_os_id}
83128314
- func: run_perf_tests
8313-
- name: e2e_tests_build_linux_x64
8315+
- name: e2e_tests_build_linux_arm64
83148316
tags: ["e2e-test"]
83158317
depends_on:
83168318
- name: compile_artifact
8317-
variant: build_linux_x64
8319+
variant: build_linux_arm64
83188320
commands:
83198321
- func: checkout
83208322
- func: install
@@ -8329,11 +8331,11 @@ tasks:
83298331
mongosh_server_test_version: ${mongosh_server_test_version}
83308332
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
83318333
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
8332-
- name: perf_tests_build_linux_x64
8334+
- name: perf_tests_build_linux_arm64
83338335
tags: ["perf-test"]
83348336
depends_on:
83358337
- name: compile_artifact
8336-
variant: build_linux_x64
8338+
variant: build_linux_arm64
83378339
commands:
83388340
- func: checkout
83398341
- func: install
@@ -14824,7 +14826,7 @@ buildvariants:
1482414826
- name: e2e_tests_build_linux_x64
1482514827
- name: perf_tests_build_linux_x64
1482614828
- name: e2e_tests_rhel93_small
14827-
display_name: "RHEL 9.3 x64 (E2E tests)"
14829+
display_name: "RHEL 9.3 x64 small (E2E tests)"
1482814830
run_on: rhel93-small
1482914831
tags: []
1483014832
expansions:
@@ -15114,239 +15116,222 @@ buildvariants:
1511415116
run_on: ubuntu1804-arm64-large
1511515117
tags: []
1511615118
expansions:
15117-
executable_os_id: ""
15119+
executable_os_id: "linux-arm64"
1511815120
disable_openssl_shared_config_for_bundled_openssl: false
1511915121
node_js_version: "20.18.1"
1512015122
mongosh_server_test_version: "6.0.x-enterprise"
1512115123
mongosh_test_e2e_force_fips: ""
1512215124
tasks:
15123-
- name: compile_artifact
15124-
- name: e2e_tests
15125-
- name: perf_tests
15125+
- name: e2e_tests_build_linux_arm64
15126+
- name: perf_tests_build_linux_arm64
1512615127
- name: e2e_tests_ubuntu2004_arm64_small
1512715128
display_name: "Ubuntu 20.04 arm64 (E2E tests)"
1512815129
run_on: ubuntu2004-arm64-small
1512915130
tags: []
1513015131
expansions:
15131-
executable_os_id: ""
15132+
executable_os_id: "linux-arm64"
1513215133
disable_openssl_shared_config_for_bundled_openssl: false
1513315134
node_js_version: "20.18.1"
1513415135
mongosh_server_test_version: "stable-enterprise"
1513515136
mongosh_test_e2e_force_fips: ""
1513615137
tasks:
15137-
- name: compile_artifact
15138-
- name: e2e_tests
15139-
- name: perf_tests
15138+
- name: e2e_tests_build_linux_arm64
15139+
- name: perf_tests_build_linux_arm64
1514015140
- name: e2e_tests_ubuntu2004_arm64_small_openssl11
1514115141
display_name: "Ubuntu 20.04 arm64 openssl11 (E2E tests)"
1514215142
run_on: ubuntu2004-arm64-small
1514315143
tags: []
1514415144
expansions:
15145-
executable_os_id: ""
15145+
executable_os_id: "linux-arm64"
1514615146
disable_openssl_shared_config_for_bundled_openssl: false
1514715147
node_js_version: "20.18.1"
1514815148
mongosh_server_test_version: "stable-enterprise"
1514915149
mongosh_test_e2e_force_fips: ""
1515015150
tasks:
15151-
- name: compile_artifact
15152-
- name: e2e_tests
15153-
- name: perf_tests
15151+
- name: e2e_tests_build_linux_arm64
15152+
- name: perf_tests_build_linux_arm64
1515415153
- name: e2e_tests_ubuntu2204_arm64_small
1515515154
display_name: "Ubuntu 22.04 arm64 (E2E tests)"
1515615155
run_on: ubuntu2204-arm64-small
1515715156
tags: []
1515815157
expansions:
15159-
executable_os_id: ""
15158+
executable_os_id: "linux-arm64"
1516015159
disable_openssl_shared_config_for_bundled_openssl: false
1516115160
node_js_version: "20.18.1"
1516215161
mongosh_server_test_version: "stable-enterprise"
1516315162
mongosh_test_e2e_force_fips: ""
1516415163
tasks:
15165-
- name: compile_artifact
15166-
- name: e2e_tests
15167-
- name: perf_tests
15164+
- name: e2e_tests_build_linux_arm64
15165+
- name: perf_tests_build_linux_arm64
1516815166
- name: e2e_tests_ubuntu2204_arm64_small_openssl3
1516915167
display_name: "Ubuntu 22.04 arm64 openssl3 (E2E tests)"
1517015168
run_on: ubuntu2204-arm64-small
1517115169
tags: []
1517215170
expansions:
15173-
executable_os_id: ""
15171+
executable_os_id: "linux-arm64"
1517415172
disable_openssl_shared_config_for_bundled_openssl: false
1517515173
node_js_version: "20.18.1"
1517615174
mongosh_server_test_version: "stable-enterprise"
1517715175
mongosh_test_e2e_force_fips: ""
1517815176
tasks:
15179-
- name: compile_artifact
15180-
- name: e2e_tests
15181-
- name: perf_tests
15177+
- name: e2e_tests_build_linux_arm64
15178+
- name: perf_tests_build_linux_arm64
1518215179
- name: e2e_tests_ubuntu2404_arm64_small
1518315180
display_name: "Ubuntu 24.04 arm64 (E2E tests)"
1518415181
run_on: ubuntu2404-arm64-small
1518515182
tags: []
1518615183
expansions:
15187-
executable_os_id: ""
15184+
executable_os_id: "linux-arm64"
1518815185
disable_openssl_shared_config_for_bundled_openssl: false
1518915186
node_js_version: "20.18.1"
1519015187
mongosh_server_test_version: "stable-enterprise"
1519115188
mongosh_test_e2e_force_fips: ""
1519215189
tasks:
15193-
- name: compile_artifact
15194-
- name: e2e_tests
15195-
- name: perf_tests
15190+
- name: e2e_tests_build_linux_arm64
15191+
- name: perf_tests_build_linux_arm64
1519615192
- name: e2e_tests_ubuntu2404_arm64_small_openssl3
1519715193
display_name: "Ubuntu 24.04 arm64 openssl3 (E2E tests)"
1519815194
run_on: ubuntu2404-arm64-small
1519915195
tags: []
1520015196
expansions:
15201-
executable_os_id: ""
15197+
executable_os_id: "linux-arm64"
1520215198
disable_openssl_shared_config_for_bundled_openssl: false
1520315199
node_js_version: "20.18.1"
1520415200
mongosh_server_test_version: "stable-enterprise"
1520515201
mongosh_test_e2e_force_fips: ""
1520615202
tasks:
15207-
- name: compile_artifact
15208-
- name: e2e_tests
15209-
- name: perf_tests
15203+
- name: e2e_tests_build_linux_arm64
15204+
- name: perf_tests_build_linux_arm64
1521015205
- name: e2e_tests_amazon2_arm64_large_m70x
1521115206
display_name: "Amazon Linux 2 arm64 70x (E2E tests)"
1521215207
run_on: amazon2-arm64-large
1521315208
tags: []
1521415209
expansions:
15215-
executable_os_id: ""
15210+
executable_os_id: "linux-arm64"
1521615211
disable_openssl_shared_config_for_bundled_openssl: false
1521715212
node_js_version: "20.18.1"
1521815213
mongosh_server_test_version: "7.0.x-enterprise"
1521915214
mongosh_test_e2e_force_fips: ""
1522015215
tasks:
15221-
- name: compile_artifact
15222-
- name: e2e_tests
15223-
- name: perf_tests
15216+
- name: e2e_tests_build_linux_arm64
15217+
- name: perf_tests_build_linux_arm64
1522415218
- name: e2e_tests_amazon2023.0_arm64_small
1522515219
display_name: "Amazon Linux 2023 arm64 (E2E tests)"
1522615220
run_on: amazon2023.0-arm64-small
1522715221
tags: []
1522815222
expansions:
15229-
executable_os_id: ""
15223+
executable_os_id: "linux-arm64"
1523015224
disable_openssl_shared_config_for_bundled_openssl: true
1523115225
node_js_version: "20.18.1"
1523215226
mongosh_server_test_version: "stable-enterprise"
1523315227
mongosh_test_e2e_force_fips: ""
1523415228
tasks:
15235-
- name: compile_artifact
15236-
- name: e2e_tests
15237-
- name: perf_tests
15229+
- name: e2e_tests_build_linux_arm64
15230+
- name: perf_tests_build_linux_arm64
1523815231
- name: e2e_tests_rhel82_arm64_small
1523915232
display_name: "RHEL 8.2 arm64 (E2E tests)"
1524015233
run_on: rhel82-arm64-small
1524115234
tags: []
1524215235
expansions:
15243-
executable_os_id: ""
15236+
executable_os_id: "linux-arm64"
1524415237
disable_openssl_shared_config_for_bundled_openssl: false
1524515238
node_js_version: "20.18.1"
1524615239
mongosh_server_test_version: "stable-enterprise"
1524715240
mongosh_test_e2e_force_fips: ""
1524815241
tasks:
15249-
- name: compile_artifact
15250-
- name: e2e_tests
15251-
- name: perf_tests
15242+
- name: e2e_tests_build_linux_arm64
15243+
- name: perf_tests_build_linux_arm64
1525215244
- name: e2e_tests_rhel90_arm64_small_m70x
1525315245
display_name: "RHEL 9.0 arm64 70x (E2E tests)"
1525415246
run_on: rhel90-arm64-small
1525515247
tags: []
1525615248
expansions:
15257-
executable_os_id: ""
15249+
executable_os_id: "linux-arm64"
1525815250
disable_openssl_shared_config_for_bundled_openssl: true
1525915251
node_js_version: "20.18.1"
1526015252
mongosh_server_test_version: "7.0.x-enterprise"
1526115253
mongosh_test_e2e_force_fips: ""
1526215254
tasks:
15263-
- name: compile_artifact
15264-
- name: e2e_tests
15265-
- name: perf_tests
15255+
- name: e2e_tests_build_linux_arm64
15256+
- name: perf_tests_build_linux_arm64
1526615257
- name: e2e_tests_rhel90_arm64_small_openssl3_m70x
1526715258
display_name: "RHEL 9.0 arm64 70x openssl3 (E2E tests)"
1526815259
run_on: rhel90-arm64-small
1526915260
tags: []
1527015261
expansions:
15271-
executable_os_id: ""
15262+
executable_os_id: "linux-arm64"
1527215263
disable_openssl_shared_config_for_bundled_openssl: true
1527315264
node_js_version: "20.18.1"
1527415265
mongosh_server_test_version: "7.0.x-enterprise"
1527515266
mongosh_test_e2e_force_fips: ""
1527615267
tasks:
15277-
- name: compile_artifact
15278-
- name: e2e_tests
15279-
- name: perf_tests
15268+
- name: e2e_tests_build_linux_arm64
15269+
- name: perf_tests_build_linux_arm64
1528015270
- name: e2e_tests_rhel93_arm64_small
1528115271
display_name: "RHEL 9.3 arm64 (E2E tests)"
1528215272
run_on: rhel93-arm64-small
1528315273
tags: []
1528415274
expansions:
15285-
executable_os_id: ""
15275+
executable_os_id: "linux-arm64"
1528615276
disable_openssl_shared_config_for_bundled_openssl: true
1528715277
node_js_version: "20.18.1"
1528815278
mongosh_server_test_version: "stable-enterprise"
1528915279
mongosh_test_e2e_force_fips: ""
1529015280
tasks:
15291-
- name: compile_artifact
15292-
- name: e2e_tests
15293-
- name: perf_tests
15281+
- name: e2e_tests_build_linux_arm64
15282+
- name: perf_tests_build_linux_arm64
1529415283
- name: e2e_tests_rhel93_arm64_small_openssl3
1529515284
display_name: "RHEL 9.3 arm64 openssl3 (E2E tests)"
1529615285
run_on: rhel93-arm64-small
1529715286
tags: []
1529815287
expansions:
15299-
executable_os_id: ""
15288+
executable_os_id: "linux-arm64"
1530015289
disable_openssl_shared_config_for_bundled_openssl: true
1530115290
node_js_version: "20.18.1"
1530215291
mongosh_server_test_version: "stable-enterprise"
1530315292
mongosh_test_e2e_force_fips: ""
1530415293
tasks:
15305-
- name: compile_artifact
15306-
- name: e2e_tests
15307-
- name: perf_tests
15294+
- name: e2e_tests_build_linux_arm64
15295+
- name: perf_tests_build_linux_arm64
1530815296
- name: e2e_tests_rhel8_power_small
1530915297
display_name: "RHEL 8 PPC (E2E tests)"
1531015298
run_on: rhel8-power-small
1531115299
tags: []
1531215300
expansions:
15313-
executable_os_id: ""
15301+
executable_os_id: "linux-x64"
1531415302
disable_openssl_shared_config_for_bundled_openssl: false
1531515303
node_js_version: "20.18.1"
1531615304
mongosh_server_test_version: "stable-enterprise"
1531715305
mongosh_test_e2e_force_fips: ""
1531815306
tasks:
15319-
- name: compile_artifact
15320-
- name: e2e_tests
15321-
- name: perf_tests
15307+
- name: e2e_tests_build_linux_x64
15308+
- name: perf_tests_build_linux_x64
1532215309
- name: e2e_tests_rhel7_zseries_large_m60x
1532315310
display_name: "RHEL 7 s390x 60x (E2E tests)"
1532415311
run_on: rhel7-zseries-large
1532515312
tags: []
1532615313
expansions:
15327-
executable_os_id: ""
15314+
executable_os_id: "linux-x64"
1532815315
disable_openssl_shared_config_for_bundled_openssl: false
1532915316
node_js_version: "20.18.1"
1533015317
mongosh_server_test_version: "6.0.x-enterprise"
1533115318
mongosh_test_e2e_force_fips: ""
1533215319
tasks:
15333-
- name: compile_artifact
15334-
- name: e2e_tests
15335-
- name: perf_tests
15320+
- name: e2e_tests_build_linux_x64
15321+
- name: perf_tests_build_linux_x64
1533615322
- name: e2e_tests_rhel8_zseries_small
1533715323
display_name: "RHEL 8 s390x (E2E tests)"
1533815324
run_on: rhel8-zseries-small
1533915325
tags: []
1534015326
expansions:
15341-
executable_os_id: ""
15327+
executable_os_id: "linux-x64"
1534215328
disable_openssl_shared_config_for_bundled_openssl: false
1534315329
node_js_version: "20.18.1"
1534415330
mongosh_server_test_version: "stable-enterprise"
1534515331
mongosh_test_e2e_force_fips: ""
1534615332
tasks:
15347-
- name: compile_artifact
15348-
- name: e2e_tests
15349-
- name: perf_tests
15333+
- name: e2e_tests_build_linux_x64
15334+
- name: perf_tests_build_linux_x64
1535015335
- name: e2e_tests_macos_14
1535115336
display_name: "MacOS 14 x64 (E2E tests)"
1535215337
run_on: macos-14

0 commit comments

Comments
 (0)