Skip to content

Commit b168637

Browse files
committed
Share all build variants
1 parent 2b91023 commit b168637

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
@@ -8275,10 +8275,11 @@ tasks:
82758275
# E2E TESTS
82768276
###
82778277
# Some tests reuse the same compilation build variant, so we create those variations of tasks to set those dependencies.
8278-
- name: e2e_tests
8278+
- name: e2e_tests_build_linux_x64
82798279
tags: ["e2e-test"]
82808280
depends_on:
82818281
- name: compile_artifact
8282+
variant: build_linux_x64
82828283
commands:
82838284
- func: checkout
82848285
- func: install
@@ -8293,10 +8294,11 @@ tasks:
82938294
mongosh_server_test_version: ${mongosh_server_test_version}
82948295
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
82958296
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
8296-
- name: perf_tests
8297+
- name: perf_tests_build_linux_x64
82978298
tags: ["perf-test"]
82988299
depends_on:
82998300
- name: compile_artifact
8301+
variant: build_linux_x64
83008302
commands:
83018303
- func: checkout
83028304
- func: install
@@ -8306,11 +8308,11 @@ tasks:
83068308
vars:
83078309
executable_os_id: ${executable_os_id}
83088310
- func: run_perf_tests
8309-
- name: e2e_tests_build_linux_x64
8311+
- name: e2e_tests_build_linux_arm64
83108312
tags: ["e2e-test"]
83118313
depends_on:
83128314
- name: compile_artifact
8313-
variant: build_linux_x64
8315+
variant: build_linux_arm64
83148316
commands:
83158317
- func: checkout
83168318
- func: install
@@ -8325,11 +8327,11 @@ tasks:
83258327
mongosh_server_test_version: ${mongosh_server_test_version}
83268328
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
83278329
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
8328-
- name: perf_tests_build_linux_x64
8330+
- name: perf_tests_build_linux_arm64
83298331
tags: ["perf-test"]
83308332
depends_on:
83318333
- name: compile_artifact
8332-
variant: build_linux_x64
8334+
variant: build_linux_arm64
83338335
commands:
83348336
- func: checkout
83358337
- func: install
@@ -14820,7 +14822,7 @@ buildvariants:
1482014822
- name: e2e_tests_build_linux_x64
1482114823
- name: perf_tests_build_linux_x64
1482214824
- name: e2e_tests_rhel93_small
14823-
display_name: "RHEL 9.3 x64 (E2E tests)"
14825+
display_name: "RHEL 9.3 x64 small (E2E tests)"
1482414826
run_on: rhel93-small
1482514827
tags: []
1482614828
expansions:
@@ -15110,239 +15112,222 @@ buildvariants:
1511015112
run_on: ubuntu1804-arm64-large
1511115113
tags: []
1511215114
expansions:
15113-
executable_os_id: ""
15115+
executable_os_id: "linux-arm64"
1511415116
disable_openssl_shared_config_for_bundled_openssl: false
1511515117
node_js_version: "20.18.1"
1511615118
mongosh_server_test_version: "6.0.x-enterprise"
1511715119
mongosh_test_e2e_force_fips: ""
1511815120
tasks:
15119-
- name: compile_artifact
15120-
- name: e2e_tests
15121-
- name: perf_tests
15121+
- name: e2e_tests_build_linux_arm64
15122+
- name: perf_tests_build_linux_arm64
1512215123
- name: e2e_tests_ubuntu2004_arm64_small
1512315124
display_name: "Ubuntu 20.04 arm64 (E2E tests)"
1512415125
run_on: ubuntu2004-arm64-small
1512515126
tags: []
1512615127
expansions:
15127-
executable_os_id: ""
15128+
executable_os_id: "linux-arm64"
1512815129
disable_openssl_shared_config_for_bundled_openssl: false
1512915130
node_js_version: "20.18.1"
1513015131
mongosh_server_test_version: "stable-enterprise"
1513115132
mongosh_test_e2e_force_fips: ""
1513215133
tasks:
15133-
- name: compile_artifact
15134-
- name: e2e_tests
15135-
- name: perf_tests
15134+
- name: e2e_tests_build_linux_arm64
15135+
- name: perf_tests_build_linux_arm64
1513615136
- name: e2e_tests_ubuntu2004_arm64_small_openssl11
1513715137
display_name: "Ubuntu 20.04 arm64 openssl11 (E2E tests)"
1513815138
run_on: ubuntu2004-arm64-small
1513915139
tags: []
1514015140
expansions:
15141-
executable_os_id: ""
15141+
executable_os_id: "linux-arm64"
1514215142
disable_openssl_shared_config_for_bundled_openssl: false
1514315143
node_js_version: "20.18.1"
1514415144
mongosh_server_test_version: "stable-enterprise"
1514515145
mongosh_test_e2e_force_fips: ""
1514615146
tasks:
15147-
- name: compile_artifact
15148-
- name: e2e_tests
15149-
- name: perf_tests
15147+
- name: e2e_tests_build_linux_arm64
15148+
- name: perf_tests_build_linux_arm64
1515015149
- name: e2e_tests_ubuntu2204_arm64_small
1515115150
display_name: "Ubuntu 22.04 arm64 (E2E tests)"
1515215151
run_on: ubuntu2204-arm64-small
1515315152
tags: []
1515415153
expansions:
15155-
executable_os_id: ""
15154+
executable_os_id: "linux-arm64"
1515615155
disable_openssl_shared_config_for_bundled_openssl: false
1515715156
node_js_version: "20.18.1"
1515815157
mongosh_server_test_version: "stable-enterprise"
1515915158
mongosh_test_e2e_force_fips: ""
1516015159
tasks:
15161-
- name: compile_artifact
15162-
- name: e2e_tests
15163-
- name: perf_tests
15160+
- name: e2e_tests_build_linux_arm64
15161+
- name: perf_tests_build_linux_arm64
1516415162
- name: e2e_tests_ubuntu2204_arm64_small_openssl3
1516515163
display_name: "Ubuntu 22.04 arm64 openssl3 (E2E tests)"
1516615164
run_on: ubuntu2204-arm64-small
1516715165
tags: []
1516815166
expansions:
15169-
executable_os_id: ""
15167+
executable_os_id: "linux-arm64"
1517015168
disable_openssl_shared_config_for_bundled_openssl: false
1517115169
node_js_version: "20.18.1"
1517215170
mongosh_server_test_version: "stable-enterprise"
1517315171
mongosh_test_e2e_force_fips: ""
1517415172
tasks:
15175-
- name: compile_artifact
15176-
- name: e2e_tests
15177-
- name: perf_tests
15173+
- name: e2e_tests_build_linux_arm64
15174+
- name: perf_tests_build_linux_arm64
1517815175
- name: e2e_tests_ubuntu2404_arm64_small
1517915176
display_name: "Ubuntu 24.04 arm64 (E2E tests)"
1518015177
run_on: ubuntu2404-arm64-small
1518115178
tags: []
1518215179
expansions:
15183-
executable_os_id: ""
15180+
executable_os_id: "linux-arm64"
1518415181
disable_openssl_shared_config_for_bundled_openssl: false
1518515182
node_js_version: "20.18.1"
1518615183
mongosh_server_test_version: "stable-enterprise"
1518715184
mongosh_test_e2e_force_fips: ""
1518815185
tasks:
15189-
- name: compile_artifact
15190-
- name: e2e_tests
15191-
- name: perf_tests
15186+
- name: e2e_tests_build_linux_arm64
15187+
- name: perf_tests_build_linux_arm64
1519215188
- name: e2e_tests_ubuntu2404_arm64_small_openssl3
1519315189
display_name: "Ubuntu 24.04 arm64 openssl3 (E2E tests)"
1519415190
run_on: ubuntu2404-arm64-small
1519515191
tags: []
1519615192
expansions:
15197-
executable_os_id: ""
15193+
executable_os_id: "linux-arm64"
1519815194
disable_openssl_shared_config_for_bundled_openssl: false
1519915195
node_js_version: "20.18.1"
1520015196
mongosh_server_test_version: "stable-enterprise"
1520115197
mongosh_test_e2e_force_fips: ""
1520215198
tasks:
15203-
- name: compile_artifact
15204-
- name: e2e_tests
15205-
- name: perf_tests
15199+
- name: e2e_tests_build_linux_arm64
15200+
- name: perf_tests_build_linux_arm64
1520615201
- name: e2e_tests_amazon2_arm64_large_m70x
1520715202
display_name: "Amazon Linux 2 arm64 70x (E2E tests)"
1520815203
run_on: amazon2-arm64-large
1520915204
tags: []
1521015205
expansions:
15211-
executable_os_id: ""
15206+
executable_os_id: "linux-arm64"
1521215207
disable_openssl_shared_config_for_bundled_openssl: false
1521315208
node_js_version: "20.18.1"
1521415209
mongosh_server_test_version: "7.0.x-enterprise"
1521515210
mongosh_test_e2e_force_fips: ""
1521615211
tasks:
15217-
- name: compile_artifact
15218-
- name: e2e_tests
15219-
- name: perf_tests
15212+
- name: e2e_tests_build_linux_arm64
15213+
- name: perf_tests_build_linux_arm64
1522015214
- name: e2e_tests_amazon2023.0_arm64_small
1522115215
display_name: "Amazon Linux 2023 arm64 (E2E tests)"
1522215216
run_on: amazon2023.0-arm64-small
1522315217
tags: []
1522415218
expansions:
15225-
executable_os_id: ""
15219+
executable_os_id: "linux-arm64"
1522615220
disable_openssl_shared_config_for_bundled_openssl: true
1522715221
node_js_version: "20.18.1"
1522815222
mongosh_server_test_version: "stable-enterprise"
1522915223
mongosh_test_e2e_force_fips: ""
1523015224
tasks:
15231-
- name: compile_artifact
15232-
- name: e2e_tests
15233-
- name: perf_tests
15225+
- name: e2e_tests_build_linux_arm64
15226+
- name: perf_tests_build_linux_arm64
1523415227
- name: e2e_tests_rhel82_arm64_small
1523515228
display_name: "RHEL 8.2 arm64 (E2E tests)"
1523615229
run_on: rhel82-arm64-small
1523715230
tags: []
1523815231
expansions:
15239-
executable_os_id: ""
15232+
executable_os_id: "linux-arm64"
1524015233
disable_openssl_shared_config_for_bundled_openssl: false
1524115234
node_js_version: "20.18.1"
1524215235
mongosh_server_test_version: "stable-enterprise"
1524315236
mongosh_test_e2e_force_fips: ""
1524415237
tasks:
15245-
- name: compile_artifact
15246-
- name: e2e_tests
15247-
- name: perf_tests
15238+
- name: e2e_tests_build_linux_arm64
15239+
- name: perf_tests_build_linux_arm64
1524815240
- name: e2e_tests_rhel90_arm64_small_m70x
1524915241
display_name: "RHEL 9.0 arm64 70x (E2E tests)"
1525015242
run_on: rhel90-arm64-small
1525115243
tags: []
1525215244
expansions:
15253-
executable_os_id: ""
15245+
executable_os_id: "linux-arm64"
1525415246
disable_openssl_shared_config_for_bundled_openssl: true
1525515247
node_js_version: "20.18.1"
1525615248
mongosh_server_test_version: "7.0.x-enterprise"
1525715249
mongosh_test_e2e_force_fips: ""
1525815250
tasks:
15259-
- name: compile_artifact
15260-
- name: e2e_tests
15261-
- name: perf_tests
15251+
- name: e2e_tests_build_linux_arm64
15252+
- name: perf_tests_build_linux_arm64
1526215253
- name: e2e_tests_rhel90_arm64_small_openssl3_m70x
1526315254
display_name: "RHEL 9.0 arm64 70x openssl3 (E2E tests)"
1526415255
run_on: rhel90-arm64-small
1526515256
tags: []
1526615257
expansions:
15267-
executable_os_id: ""
15258+
executable_os_id: "linux-arm64"
1526815259
disable_openssl_shared_config_for_bundled_openssl: true
1526915260
node_js_version: "20.18.1"
1527015261
mongosh_server_test_version: "7.0.x-enterprise"
1527115262
mongosh_test_e2e_force_fips: ""
1527215263
tasks:
15273-
- name: compile_artifact
15274-
- name: e2e_tests
15275-
- name: perf_tests
15264+
- name: e2e_tests_build_linux_arm64
15265+
- name: perf_tests_build_linux_arm64
1527615266
- name: e2e_tests_rhel93_arm64_small
1527715267
display_name: "RHEL 9.3 arm64 (E2E tests)"
1527815268
run_on: rhel93-arm64-small
1527915269
tags: []
1528015270
expansions:
15281-
executable_os_id: ""
15271+
executable_os_id: "linux-arm64"
1528215272
disable_openssl_shared_config_for_bundled_openssl: true
1528315273
node_js_version: "20.18.1"
1528415274
mongosh_server_test_version: "stable-enterprise"
1528515275
mongosh_test_e2e_force_fips: ""
1528615276
tasks:
15287-
- name: compile_artifact
15288-
- name: e2e_tests
15289-
- name: perf_tests
15277+
- name: e2e_tests_build_linux_arm64
15278+
- name: perf_tests_build_linux_arm64
1529015279
- name: e2e_tests_rhel93_arm64_small_openssl3
1529115280
display_name: "RHEL 9.3 arm64 openssl3 (E2E tests)"
1529215281
run_on: rhel93-arm64-small
1529315282
tags: []
1529415283
expansions:
15295-
executable_os_id: ""
15284+
executable_os_id: "linux-arm64"
1529615285
disable_openssl_shared_config_for_bundled_openssl: true
1529715286
node_js_version: "20.18.1"
1529815287
mongosh_server_test_version: "stable-enterprise"
1529915288
mongosh_test_e2e_force_fips: ""
1530015289
tasks:
15301-
- name: compile_artifact
15302-
- name: e2e_tests
15303-
- name: perf_tests
15290+
- name: e2e_tests_build_linux_arm64
15291+
- name: perf_tests_build_linux_arm64
1530415292
- name: e2e_tests_rhel8_power_small
1530515293
display_name: "RHEL 8 PPC (E2E tests)"
1530615294
run_on: rhel8-power-small
1530715295
tags: []
1530815296
expansions:
15309-
executable_os_id: ""
15297+
executable_os_id: "linux-x64"
1531015298
disable_openssl_shared_config_for_bundled_openssl: false
1531115299
node_js_version: "20.18.1"
1531215300
mongosh_server_test_version: "stable-enterprise"
1531315301
mongosh_test_e2e_force_fips: ""
1531415302
tasks:
15315-
- name: compile_artifact
15316-
- name: e2e_tests
15317-
- name: perf_tests
15303+
- name: e2e_tests_build_linux_x64
15304+
- name: perf_tests_build_linux_x64
1531815305
- name: e2e_tests_rhel7_zseries_large_m60x
1531915306
display_name: "RHEL 7 s390x 60x (E2E tests)"
1532015307
run_on: rhel7-zseries-large
1532115308
tags: []
1532215309
expansions:
15323-
executable_os_id: ""
15310+
executable_os_id: "linux-x64"
1532415311
disable_openssl_shared_config_for_bundled_openssl: false
1532515312
node_js_version: "20.18.1"
1532615313
mongosh_server_test_version: "6.0.x-enterprise"
1532715314
mongosh_test_e2e_force_fips: ""
1532815315
tasks:
15329-
- name: compile_artifact
15330-
- name: e2e_tests
15331-
- name: perf_tests
15316+
- name: e2e_tests_build_linux_x64
15317+
- name: perf_tests_build_linux_x64
1533215318
- name: e2e_tests_rhel8_zseries_small
1533315319
display_name: "RHEL 8 s390x (E2E tests)"
1533415320
run_on: rhel8-zseries-small
1533515321
tags: []
1533615322
expansions:
15337-
executable_os_id: ""
15323+
executable_os_id: "linux-x64"
1533815324
disable_openssl_shared_config_for_bundled_openssl: false
1533915325
node_js_version: "20.18.1"
1534015326
mongosh_server_test_version: "stable-enterprise"
1534115327
mongosh_test_e2e_force_fips: ""
1534215328
tasks:
15343-
- name: compile_artifact
15344-
- name: e2e_tests
15345-
- name: perf_tests
15329+
- name: e2e_tests_build_linux_x64
15330+
- name: perf_tests_build_linux_x64
1534615331
- name: e2e_tests_macos_14
1534715332
display_name: "MacOS 14 x64 (E2E tests)"
1534815333
run_on: macos-14

0 commit comments

Comments
 (0)