Skip to content

Commit c0a9369

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents 2aa7d37 + 6c35f6b commit c0a9369

File tree

250 files changed

+17489
-7021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+17489
-7021
lines changed

‎.evergreen/buildvariants-and-tasks.in.yml‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const UNIT_TESTS_BUILD_VARIANTS = [
33
{
44
name: 'unit-tests-ubuntu',
55
display_name: 'Unit Tests Ubuntu',
6-
run_on: 'ubuntu2004-large',
6+
run_on: 'ubuntu2204-large',
77
},
88
{
99
name: 'unit-tests-windows',
@@ -13,7 +13,7 @@ const UNIT_TESTS_BUILD_VARIANTS = [
1313
{
1414
name: 'unit-tests-rhel',
1515
display_name: 'Unit Tests RHEL',
16-
run_on: 'rhel80-large',
16+
run_on: 'rhel93-large',
1717
},
1818
{
1919
name: 'unit-tests-macos',
@@ -27,11 +27,7 @@ const PACKAGE_BUILD_VARIANTS = [
2727
{
2828
name: 'package-ubuntu',
2929
display_name: 'Package Ubuntu',
30-
31-
// # NOTE: We are packaging on Ubuntu 18.04 in order to use glibc 2.27
32-
// # when compiling/re-building addons. This ensures compatibility with other
33-
// # debian platforms that have glibc 2.27 or newer.
34-
run_on: 'ubuntu1804-large',
30+
run_on: 'ubuntu2004-large',
3531
target_platform: 'ubuntu',
3632
},
3733
{
@@ -49,22 +45,22 @@ const PACKAGE_BUILD_VARIANTS = [
4945
{
5046
name: 'package-macos-x64',
5147
display_name: 'Package MacOS Intel',
52-
run_on: 'macos-14',
48+
run_on: 'macos-13',
5349
target_platform: 'macos',
5450
},
5551
{
5652
name: 'package-macos-arm',
5753
display_name: 'Package MacOS Arm64',
58-
run_on: 'macos-14-arm64',
54+
run_on: 'macos-13-arm64',
5955
target_platform: 'macos-arm',
6056
}
6157
];
6258
6359
const TEST_PACKAGED_APP_BUILD_VARIANTS = [
6460
{
6561
name: 'test-packaged-app-ubuntu',
66-
display_name: 'Ubuntu 20.04',
67-
run_on: 'ubuntu2004-large',
62+
display_name: 'Ubuntu 22.04',
63+
run_on: 'ubuntu2204-large',
6864
depends_on: 'package-ubuntu',
6965
},
7066
{
@@ -75,8 +71,8 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
7571
},
7672
{
7773
name: 'test-packaged-app-rhel',
78-
display_name: 'RHEL 8.0',
79-
run_on: 'rhel80-large',
74+
display_name: 'RHEL 9.3',
75+
run_on: 'rhel93-large',
8076
depends_on: 'package-rhel',
8177
},
8278
{
@@ -144,7 +140,7 @@ const E2E_TEST_GROUPS = Array.from({ length: E2E_TEST_GROUPS_NUMBER }).map((_, i
144140
buildvariants:
145141
- name: check
146142
display_name: Check
147-
run_on: ubuntu2004-large
143+
run_on: ubuntu2204-large
148144
tasks:
149145
- name: check
150146

@@ -177,7 +173,7 @@ buildvariants:
177173

178174
- name: smoketest-packaged-app
179175
display_name: Smoke Test via GitHub Actions
180-
run_on: ubuntu2004-large
176+
run_on: ubuntu2204-large
181177
depends_on:
182178
<% for (const distribution of COMPASS_DISTRIBUTIONS) { %>
183179
<% for (const buildVariant of PACKAGE_BUILD_VARIANTS) { %>
@@ -190,7 +186,7 @@ buildvariants:
190186

191187
- name: test-eol-servers
192188
display_name: Test EoL Servers
193-
run_on: ubuntu1804-large
189+
run_on: ubuntu2004-large
194190
patchable: false
195191
depends_on:
196192
- name: package-compass
@@ -204,7 +200,7 @@ buildvariants:
204200

205201
- name: test-maintained-servers
206202
display_name: Test Maintained Servers
207-
run_on: ubuntu2004-large
203+
run_on: ubuntu2204-large
208204
patchable: true
209205
depends_on:
210206
- name: package-compass
@@ -218,7 +214,7 @@ buildvariants:
218214

219215
- name: test-latest-alpha
220216
display_name: Test Latest Alpha Server
221-
run_on: ubuntu2004-large
217+
run_on: ubuntu2204-large
222218
patchable: false
223219
depends_on:
224220
- name: package-compass
@@ -250,7 +246,7 @@ buildvariants:
250246

251247
- name: publish
252248
display_name: Publish Artifacts
253-
run_on: ubuntu2004-large
249+
run_on: ubuntu2204-large
254250
tasks:
255251
- name: publish
256252
- name: publish-dev-release-info
@@ -263,27 +259,28 @@ buildvariants:
263259

264260
- name: connectivity-tests
265261
display_name: Connectivity Tests
266-
run_on: ubuntu2004-large
262+
run_on: ubuntu2204-large
267263
tasks:
268264
- name: test-connectivity
269265

270266
- name: e2e-coverage
271267
display_name: E2E Coverage
272-
run_on: ubuntu2004-large
268+
run_on: ubuntu2204-large
273269
tasks:
274270
<% for(const group of E2E_TEST_GROUPS) { %>
275271
- name: e2e-coverage-<%= group.number %>
276272
<% } %>
277273

278274
- name: csfle-tests
279275
display_name: CSFLE Tests
280-
run_on: ubuntu2004-large
276+
run_on: ubuntu2204-large
281277
tasks:
282278
- name: test-csfle
283279

284280
- name: test-web-sandbox
285281
display_name: Test Web Sandbox
286-
run_on: ubuntu2004-large
282+
# DEVPROD-22850: On ubuntu24.02, AppArmor blocks electron proxy used in web tests.
283+
run_on: ubuntu2204-large
287284
tasks:
288285
<% for (const browser of BROWSERS) { %>
289286
<% for(const group of E2E_TEST_GROUPS) { %>
@@ -293,19 +290,19 @@ buildvariants:
293290

294291
- name: test-can-bundle-compass-web
295292
display_name: Test Can Bundle Compass Web
296-
run_on: ubuntu2004-large
293+
run_on: ubuntu2204-large
297294
tasks:
298295
- name: test-can-bundle-compass-web
299296

300297
- name: test-web-sandbox-atlas-cloud
301298
display_name: Test Web Sandbox (w/ Atlas Cloud login)
302-
run_on: ubuntu2004-large
299+
run_on: ubuntu2204-large
303300
tasks:
304301
- name: test-web-sandbox-atlas-cloud
305302

306303
- name: generate-vulnerability-report
307304
display_name: Vulnerability Report
308-
run_on: ubuntu2004-large
305+
run_on: ubuntu2204-large
309306
tasks:
310307
- name: generate-vulnerability-report
311308

‎.evergreen/buildvariants-and-tasks.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
buildvariants:
44
- name: check
55
display_name: Check
6-
run_on: ubuntu2004-large
6+
run_on: ubuntu2204-large
77
tasks:
88
- name: check
99
- name: unit-tests-ubuntu
1010
display_name: Unit Tests Ubuntu
11-
run_on: ubuntu2004-large
11+
run_on: ubuntu2204-large
1212
tasks:
1313
- name: test
1414
- name: test-electron
@@ -20,7 +20,7 @@ buildvariants:
2020
- name: test-electron
2121
- name: unit-tests-rhel
2222
display_name: Unit Tests RHEL
23-
run_on: rhel80-large
23+
run_on: rhel93-large
2424
tasks:
2525
- name: test
2626
- name: test-electron
@@ -35,7 +35,7 @@ buildvariants:
3535
expansions:
3636
target_platform: ubuntu
3737
display_name: Package Ubuntu
38-
run_on: ubuntu1804-large
38+
run_on: ubuntu2004-large
3939
tasks:
4040
- name: package-compass
4141
- name: package-compass-isolated
@@ -62,7 +62,7 @@ buildvariants:
6262
expansions:
6363
target_platform: macos
6464
display_name: Package MacOS Intel
65-
run_on: macos-14
65+
run_on: macos-13
6666
tasks:
6767
- name: package-compass
6868
- name: package-compass-isolated
@@ -71,14 +71,14 @@ buildvariants:
7171
expansions:
7272
target_platform: macos-arm
7373
display_name: Package MacOS Arm64
74-
run_on: macos-14-arm64
74+
run_on: macos-13-arm64
7575
tasks:
7676
- name: package-compass
7777
- name: package-compass-isolated
7878
- name: package-compass-readonly
7979
- name: smoketest-packaged-app
8080
display_name: Smoke Test via GitHub Actions
81-
run_on: ubuntu2004-large
81+
run_on: ubuntu2204-large
8282
depends_on:
8383
- name: package-compass
8484
variant: package-ubuntu
@@ -114,7 +114,7 @@ buildvariants:
114114
- name: smoketest-packaged-app
115115
- name: test-eol-servers
116116
display_name: Test EoL Servers
117-
run_on: ubuntu1804-large
117+
run_on: ubuntu2004-large
118118
patchable: false
119119
depends_on:
120120
- name: package-compass
@@ -128,7 +128,7 @@ buildvariants:
128128
- name: test-server-60x-enterprise-3
129129
- name: test-maintained-servers
130130
display_name: Test Maintained Servers
131-
run_on: ubuntu2004-large
131+
run_on: ubuntu2204-large
132132
patchable: true
133133
depends_on:
134134
- name: package-compass
@@ -148,7 +148,7 @@ buildvariants:
148148
- name: test-server-80x-enterprise-3
149149
- name: test-latest-alpha
150150
display_name: Test Latest Alpha Server
151-
run_on: ubuntu2004-large
151+
run_on: ubuntu2204-large
152152
patchable: false
153153
depends_on:
154154
- name: package-compass
@@ -158,8 +158,8 @@ buildvariants:
158158
- name: test-server-latest-alpha-2
159159
- name: test-server-latest-alpha-3
160160
- name: test-packaged-app-ubuntu
161-
display_name: Test Packaged App Ubuntu 20.04
162-
run_on: ubuntu2004-large
161+
display_name: Test Packaged App Ubuntu 22.04
162+
run_on: ubuntu2204-large
163163
patchable: true
164164
depends_on:
165165
- name: package-compass
@@ -180,8 +180,8 @@ buildvariants:
180180
- name: test-packaged-app-2
181181
- name: test-packaged-app-3
182182
- name: test-packaged-app-rhel
183-
display_name: Test Packaged App RHEL 8.0
184-
run_on: rhel80-large
183+
display_name: Test Packaged App RHEL 9.3
184+
run_on: rhel93-large
185185
patchable: true
186186
depends_on:
187187
- name: package-compass
@@ -236,7 +236,7 @@ buildvariants:
236236
- name: test-packaged-app-3
237237
- name: publish
238238
display_name: Publish Artifacts
239-
run_on: ubuntu2004-large
239+
run_on: ubuntu2204-large
240240
tasks:
241241
- name: publish
242242
- name: publish-dev-release-info
@@ -247,24 +247,24 @@ buildvariants:
247247
- name: create_static_analysis_report
248248
- name: connectivity-tests
249249
display_name: Connectivity Tests
250-
run_on: ubuntu2004-large
250+
run_on: ubuntu2204-large
251251
tasks:
252252
- name: test-connectivity
253253
- name: e2e-coverage
254254
display_name: E2E Coverage
255-
run_on: ubuntu2004-large
255+
run_on: ubuntu2204-large
256256
tasks:
257257
- name: e2e-coverage-1
258258
- name: e2e-coverage-2
259259
- name: e2e-coverage-3
260260
- name: csfle-tests
261261
display_name: CSFLE Tests
262-
run_on: ubuntu2004-large
262+
run_on: ubuntu2204-large
263263
tasks:
264264
- name: test-csfle
265265
- name: test-web-sandbox
266266
display_name: Test Web Sandbox
267-
run_on: ubuntu2004-large
267+
run_on: ubuntu2204-large
268268
tasks:
269269
- name: test-web-sandbox-chrome-1
270270
- name: test-web-sandbox-chrome-2
@@ -274,17 +274,17 @@ buildvariants:
274274
- name: test-web-sandbox-firefox-3
275275
- name: test-can-bundle-compass-web
276276
display_name: Test Can Bundle Compass Web
277-
run_on: ubuntu2004-large
277+
run_on: ubuntu2204-large
278278
tasks:
279279
- name: test-can-bundle-compass-web
280280
- name: test-web-sandbox-atlas-cloud
281281
display_name: Test Web Sandbox (w/ Atlas Cloud login)
282-
run_on: ubuntu2004-large
282+
run_on: ubuntu2204-large
283283
tasks:
284284
- name: test-web-sandbox-atlas-cloud
285285
- name: generate-vulnerability-report
286286
display_name: Vulnerability Report
287-
run_on: ubuntu2004-large
287+
run_on: ubuntu2204-large
288288
tasks:
289289
- name: generate-vulnerability-report
290290
tasks:

‎.evergreen/create-sbom.sh‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,16 @@ trap_handler() {
1414
}
1515
trap trap_handler ERR EXIT
1616

17-
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" .sbom/dependencies.json /tmp/artifactory_password "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/
17+
# https://jira.mongodb.org/browse/MONGOSH-1856
18+
cp -v node_modules/@mongosh/node-runtime-worker-thread/dist/purls.txt node-runtime-worker-thread-purls.txt
19+
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" \
20+
.sbom/dependencies.json /tmp/artifactory_password node-runtime-worker-thread-purls.txt \
21+
"$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/
1822
ssh -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -p "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME" \
19-
"(cat /tmp/dependencies.json | jq -r '.[] | "'"pkg:npm/" + .name + "@" + .version'"' > /tmp/purls.txt) && \
23+
"(cat /tmp/dependencies.json | jq -r '.[] | \"pkg:npm/\" + .name + \"@\" + .version' > /tmp/purls.txt) && \
24+
cat /tmp/node-runtime-worker-thread-purls.txt >> /tmp/purls.txt && \
2025
echo "pkg:generic/mongo_crypt_shared@${CRYPT_SHARED_VERSION}" >> /tmp/purls.txt && \
26+
cat /tmp/purls.txt | sort | uniq > /tmp/purls-deduped.txt && mv /tmp/purls-deduped.txt /tmp/purls.txt && \
2127
(cat /tmp/artifactory_password | docker login artifactory.corp.mongodb.com --username '${ARTIFACTORY_USERNAME}' --password-stdin ; rm -f /tmp/artifactory_password ) && \
2228
docker pull artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:2.0 && \
2329
docker run --rm -v /tmp:/tmp artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:2.0 update \
@@ -29,4 +35,4 @@ ssh -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -p "$SIGNING_SERVER_PORT" "$SIGN
2935
echo \"KONDUKTO_TOKEN=\$kondukto_token\" > /tmp/kondukto_credentials.env && \
3036
docker run --env-file /tmp/kondukto_credentials.env --rm -v /tmp:/tmp artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:2.0 augment \
3137
--repo mongodb-js/compass --branch ${KONDUKTO_BRANCH} --sbom-in /tmp/sbom-lite.json --sbom-out /tmp/sbom.json"
32-
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/{sbom-lite.json,sbom.json,purls.txt} .sbom/
38+
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/{sbom-lite.json,sbom.json,purls.txt} .sbom/

‎AUTHORS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,5 @@ Leo Generali <[email protected]>
116116
Ivan Medina <[email protected]>
117117
Nick Larew <[email protected]>
118118
Shun Miyazawa <[email protected]>
119+
Kyle Lai <[email protected]>
120+
carolynmcca <[email protected]>

0 commit comments

Comments
 (0)