Skip to content

Commit 3b6e787

Browse files
gagikgagik
committed
fix broken tests
1 parent 26e52fe commit 3b6e787

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎.evergreen.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5329,7 +5329,7 @@ tasks:
53295329
tags: ["connectivity-test"]
53305330
depends_on:
53315331
- name: compile_artifact
5332-
variant: build_linux_x64
5332+
variant: build_linux_x64_openssl11
53335333
commands:
53345334
- func: checkout
53355335
- func: install
@@ -5348,7 +5348,7 @@ tasks:
53485348
tags: ["connectivity-test"]
53495349
depends_on:
53505350
- name: compile_artifact
5351-
variant: build_linux_x64
5351+
variant: build_linux_x64_openssl11
53525352
commands:
53535353
- func: checkout
53545354
- func: install
@@ -5367,7 +5367,7 @@ tasks:
53675367
tags: ["connectivity-test"]
53685368
depends_on:
53695369
- name: compile_artifact
5370-
variant: build_linux_x64
5370+
variant: build_linux_x64_openssl3
53715371
commands:
53725372
- func: checkout
53735373
- func: install
@@ -5386,7 +5386,7 @@ tasks:
53865386
tags: ["connectivity-test"]
53875387
depends_on:
53885388
- name: compile_artifact
5389-
variant: build_linux_x64
5389+
variant: build_linux_x64_openssl3
53905390
commands:
53915391
- func: checkout
53925392
- func: install
@@ -5405,7 +5405,7 @@ tasks:
54055405
tags: ["connectivity-test"]
54065406
depends_on:
54075407
- name: compile_artifact
5408-
variant: build_linux_x64
5408+
variant: build_linux_x64_openssl3
54095409
commands:
54105410
- func: checkout
54115411
- func: install
@@ -5519,7 +5519,7 @@ tasks:
55195519
tags: ["connectivity-test"]
55205520
depends_on:
55215521
- name: compile_artifact
5522-
variant: build_linux_arm64
5522+
variant: build_linux_arm64_openssl11
55235523
commands:
55245524
- func: checkout
55255525
- func: install
@@ -5538,7 +5538,7 @@ tasks:
55385538
tags: ["connectivity-test"]
55395539
depends_on:
55405540
- name: compile_artifact
5541-
variant: build_linux_arm64
5541+
variant: build_linux_arm64_openssl11
55425542
commands:
55435543
- func: checkout
55445544
- func: install
@@ -5557,7 +5557,7 @@ tasks:
55575557
tags: ["connectivity-test"]
55585558
depends_on:
55595559
- name: compile_artifact
5560-
variant: build_linux_arm64
5560+
variant: build_linux_arm64_openssl3
55615561
commands:
55625562
- func: checkout
55635563
- func: install
@@ -5576,7 +5576,7 @@ tasks:
55765576
tags: ["connectivity-test"]
55775577
depends_on:
55785578
- name: compile_artifact
5579-
variant: build_linux_arm64
5579+
variant: build_linux_arm64_openssl3
55805580
commands:
55815581
- func: checkout
55825582
- func: install
@@ -5595,7 +5595,7 @@ tasks:
55955595
tags: ["connectivity-test"]
55965596
depends_on:
55975597
- name: compile_artifact
5598-
variant: build_linux_arm64
5598+
variant: build_linux_arm64_openssl3
55995599
commands:
56005600
- func: checkout
56015601
- func: install
@@ -6033,7 +6033,7 @@ tasks:
60336033
tags: ["add-sbom-task"]
60346034
depends_on:
60356035
- name: compile_artifact
6036-
variant: build_linux_x64
6036+
variant: build_linux_x64_openssl11
60376037
commands:
60386038
- func: checkout
60396039
- func: install
@@ -6116,7 +6116,7 @@ tasks:
61166116
tags: ["add-sbom-task"]
61176117
depends_on:
61186118
- name: compile_artifact
6119-
variant: build_linux_x64
6119+
variant: build_linux_x64_openssl11
61206120
commands:
61216121
- func: checkout
61226122
- func: install
@@ -6199,7 +6199,7 @@ tasks:
61996199
tags: ["add-sbom-task"]
62006200
depends_on:
62016201
- name: compile_artifact
6202-
variant: build_linux_x64
6202+
variant: build_linux_x64_openssl11
62036203
commands:
62046204
- func: checkout
62056205
- func: install
@@ -6282,7 +6282,7 @@ tasks:
62826282
tags: ["add-sbom-task"]
62836283
depends_on:
62846284
- name: compile_artifact
6285-
variant: build_linux_x64
6285+
variant: build_linux_x64_openssl3
62866286
commands:
62876287
- func: checkout
62886288
- func: install
@@ -6365,7 +6365,7 @@ tasks:
63656365
tags: ["add-sbom-task"]
63666366
depends_on:
63676367
- name: compile_artifact
6368-
variant: build_linux_x64
6368+
variant: build_linux_x64_openssl3
63696369
commands:
63706370
- func: checkout
63716371
- func: install
@@ -6448,7 +6448,7 @@ tasks:
64486448
tags: ["add-sbom-task"]
64496449
depends_on:
64506450
- name: compile_artifact
6451-
variant: build_linux_x64
6451+
variant: build_linux_x64_openssl3
64526452
commands:
64536453
- func: checkout
64546454
- func: install
@@ -6780,7 +6780,7 @@ tasks:
67806780
tags: ["add-sbom-task"]
67816781
depends_on:
67826782
- name: compile_artifact
6783-
variant: build_linux_arm64
6783+
variant: build_linux_arm64_openssl11
67846784
commands:
67856785
- func: checkout
67866786
- func: install
@@ -6863,7 +6863,7 @@ tasks:
68636863
tags: ["add-sbom-task"]
68646864
depends_on:
68656865
- name: compile_artifact
6866-
variant: build_linux_arm64
6866+
variant: build_linux_arm64_openssl11
68676867
commands:
68686868
- func: checkout
68696869
- func: install
@@ -6946,7 +6946,7 @@ tasks:
69466946
tags: ["add-sbom-task"]
69476947
depends_on:
69486948
- name: compile_artifact
6949-
variant: build_linux_arm64
6949+
variant: build_linux_arm64_openssl11
69506950
commands:
69516951
- func: checkout
69526952
- func: install
@@ -7029,7 +7029,7 @@ tasks:
70297029
tags: ["add-sbom-task"]
70307030
depends_on:
70317031
- name: compile_artifact
7032-
variant: build_linux_arm64
7032+
variant: build_linux_arm64_openssl3
70337033
commands:
70347034
- func: checkout
70357035
- func: install
@@ -7112,7 +7112,7 @@ tasks:
71127112
tags: ["add-sbom-task"]
71137113
depends_on:
71147114
- name: compile_artifact
7115-
variant: build_linux_arm64
7115+
variant: build_linux_arm64_openssl3
71167116
commands:
71177117
- func: checkout
71187118
- func: install
@@ -7195,7 +7195,7 @@ tasks:
71957195
tags: ["add-sbom-task"]
71967196
depends_on:
71977197
- name: compile_artifact
7198-
variant: build_linux_arm64
7198+
variant: build_linux_arm64_openssl3
71997199
commands:
72007200
- func: checkout
72017201
- func: install
@@ -10920,37 +10920,37 @@ buildvariants:
1092010920
run_on: rhel8-power-small
1092110921
tags: []
1092210922
expansions:
10923-
executable_os_id: "linux-x64"
10923+
executable_os_id: "linux-ppc64le"
1092410924
disable_openssl_shared_config_for_bundled_openssl: false
1092510925
node_js_version: "20.18.1"
1092610926
mongosh_server_test_version: "stable-enterprise"
1092710927
mongosh_test_e2e_force_fips: ""
1092810928
tasks:
10929-
- name: e2e_tests_linux_x64
10929+
- name: e2e_tests_linux_ppc64le
1093010930
- name: e2e_tests_rhel7_zseries_large_m60x
1093110931
display_name: "RHEL 7 s390x 60x (E2E tests)"
1093210932
run_on: rhel7-zseries-large
1093310933
tags: []
1093410934
expansions:
10935-
executable_os_id: "linux-x64"
10935+
executable_os_id: "linux-s390x"
1093610936
disable_openssl_shared_config_for_bundled_openssl: false
1093710937
node_js_version: "20.18.1"
1093810938
mongosh_server_test_version: "6.0.x-enterprise"
1093910939
mongosh_test_e2e_force_fips: ""
1094010940
tasks:
10941-
- name: e2e_tests_linux_x64
10941+
- name: e2e_tests_linux_s390x
1094210942
- name: e2e_tests_rhel8_zseries_small
1094310943
display_name: "RHEL 8 s390x (E2E tests)"
1094410944
run_on: rhel8-zseries-small
1094510945
tags: []
1094610946
expansions:
10947-
executable_os_id: "linux-x64"
10947+
executable_os_id: "linux-s390x"
1094810948
disable_openssl_shared_config_for_bundled_openssl: false
1094910949
node_js_version: "20.18.1"
1095010950
mongosh_server_test_version: "stable-enterprise"
1095110951
mongosh_test_e2e_force_fips: ""
1095210952
tasks:
10953-
- name: e2e_tests_linux_x64
10953+
- name: e2e_tests_linux_s390x
1095410954
- name: e2e_tests_macos_14
1095510955
display_name: "MacOS 14 x64 (E2E tests)"
1095610956
run_on: macos-14

‎.evergreen/build-variants/e2e-tests-build-variants.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,19 +297,19 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
297297
{
298298
displayName: "RHEL 8 PPC",
299299
runOn: "rhel8-power-small",
300-
executableOsId: "linux-x64",
300+
executableOsId: "linux-ppc64le",
301301
mVersion: "stable",
302302
},
303303
{
304304
displayName: "RHEL 7 s390x",
305305
runOn: "rhel7-zseries-large",
306-
executableOsId: "linux-x64",
306+
executableOsId: "linux-s390x",
307307
mVersion: "6.0.x",
308308
},
309309
{
310310
displayName: "RHEL 8 s390x",
311311
runOn: "rhel8-zseries-small",
312-
executableOsId: "linux-x64",
312+
executableOsId: "linux-s390x",
313313
mVersion: "stable",
314314
},
315315
{

‎.evergreen/evergreen.yml.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ for (const packageInfo of MONGOSH_PACKAGES) {
8888
});
8989
}
9090

91-
const { E2E_TESTS_BUILD_VARIANTS } = require('./variants/e2e-tests-build-variants')
92-
const { COMPILE_BUILD_VARIANTS } = require('./variants/compile-build-variants')
91+
const { E2E_TESTS_BUILD_VARIANTS } = require('./build-variants/e2e-tests-build-variants')
92+
const { COMPILE_BUILD_VARIANTS } = require('./build-variants/compile-build-variants')
9393
const { RELEASE_PACKAGE_MATRIX } = require('../config/release-package-matrix')
9494

9595

‎config/release-package-matrix.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ exports.RELEASE_PACKAGE_MATRIX = [
135135
},
136136
{
137137
executableOsId: 'linux-x64-openssl11',
138-
compileBuildVariant: 'build_linux_x64',
138+
compileBuildVariant: 'build_linux_x64_openssl11',
139139
kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL11],
140140
packages: [
141141
{
@@ -178,7 +178,7 @@ exports.RELEASE_PACKAGE_MATRIX = [
178178
},
179179
{
180180
executableOsId: 'linux-x64-openssl3',
181-
compileBuildVariant: 'build_linux_x64',
181+
compileBuildVariant: 'build_linux_x64_openssl3',
182182
kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL3],
183183
packages: [
184184
{
@@ -273,7 +273,7 @@ exports.RELEASE_PACKAGE_MATRIX = [
273273
},
274274
{
275275
executableOsId: 'linux-arm64-openssl11',
276-
compileBuildVariant: 'build_linux_arm64',
276+
compileBuildVariant: 'build_linux_arm64_openssl11',
277277
kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL11],
278278
packages: [
279279
{
@@ -315,7 +315,7 @@ exports.RELEASE_PACKAGE_MATRIX = [
315315
},
316316
{
317317
executableOsId: 'linux-arm64-openssl3',
318-
compileBuildVariant: 'build_linux_arm64',
318+
compileBuildVariant: 'build_linux_arm64_openssl3',
319319
kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL3],
320320
packages: [
321321
{

0 commit comments

Comments
 (0)