Skip to content

Commit c3c1303

Browse files
mabaasitCopilot
andauthored
chore(ci): use ubuntu 22 for ci COMPASS-9941 (#7440)
* use ubuntu 22 for ci * update comment * Update .evergreen/buildvariants-and-tasks.in.yml Co-authored-by: Copilot <[email protected]> * fix variant display name --------- Co-authored-by: Copilot <[email protected]>
1 parent 5a5b519 commit c3c1303

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

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

Lines changed: 16 additions & 15 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',
@@ -59,8 +59,8 @@ const PACKAGE_BUILD_VARIANTS = [
5959
const TEST_PACKAGED_APP_BUILD_VARIANTS = [
6060
{
6161
name: 'test-packaged-app-ubuntu',
62-
display_name: 'Ubuntu 20.04',
63-
run_on: 'ubuntu2004-large',
62+
display_name: 'Ubuntu 22.04',
63+
run_on: 'ubuntu2204-large',
6464
depends_on: 'package-ubuntu',
6565
},
6666
{
@@ -140,7 +140,7 @@ const E2E_TEST_GROUPS = Array.from({ length: E2E_TEST_GROUPS_NUMBER }).map((_, i
140140
buildvariants:
141141
- name: check
142142
display_name: Check
143-
run_on: ubuntu2004-large
143+
run_on: ubuntu2204-large
144144
tasks:
145145
- name: check
146146

@@ -173,7 +173,7 @@ buildvariants:
173173

174174
- name: smoketest-packaged-app
175175
display_name: Smoke Test via GitHub Actions
176-
run_on: ubuntu2004-large
176+
run_on: ubuntu2204-large
177177
depends_on:
178178
<% for (const distribution of COMPASS_DISTRIBUTIONS) { %>
179179
<% for (const buildVariant of PACKAGE_BUILD_VARIANTS) { %>
@@ -200,7 +200,7 @@ buildvariants:
200200

201201
- name: test-maintained-servers
202202
display_name: Test Maintained Servers
203-
run_on: ubuntu2004-large
203+
run_on: ubuntu2204-large
204204
patchable: true
205205
depends_on:
206206
- name: package-compass
@@ -214,7 +214,7 @@ buildvariants:
214214

215215
- name: test-latest-alpha
216216
display_name: Test Latest Alpha Server
217-
run_on: ubuntu2004-large
217+
run_on: ubuntu2204-large
218218
patchable: false
219219
depends_on:
220220
- name: package-compass
@@ -246,7 +246,7 @@ buildvariants:
246246

247247
- name: publish
248248
display_name: Publish Artifacts
249-
run_on: ubuntu2004-large
249+
run_on: ubuntu2204-large
250250
tasks:
251251
- name: publish
252252
- name: publish-dev-release-info
@@ -259,27 +259,28 @@ buildvariants:
259259

260260
- name: connectivity-tests
261261
display_name: Connectivity Tests
262-
run_on: ubuntu2004-large
262+
run_on: ubuntu2204-large
263263
tasks:
264264
- name: test-connectivity
265265

266266
- name: e2e-coverage
267267
display_name: E2E Coverage
268-
run_on: ubuntu2004-large
268+
run_on: ubuntu2204-large
269269
tasks:
270270
<% for(const group of E2E_TEST_GROUPS) { %>
271271
- name: e2e-coverage-<%= group.number %>
272272
<% } %>
273273

274274
- name: csfle-tests
275275
display_name: CSFLE Tests
276-
run_on: ubuntu2004-large
276+
run_on: ubuntu2204-large
277277
tasks:
278278
- name: test-csfle
279279

280280
- name: test-web-sandbox
281281
display_name: Test Web Sandbox
282-
run_on: ubuntu2004-large
282+
# DEVPROD-22850: On ubuntu24.02, AppArmor blocks electron proxy used in web tests.
283+
run_on: ubuntu2204-large
283284
tasks:
284285
<% for (const browser of BROWSERS) { %>
285286
<% for(const group of E2E_TEST_GROUPS) { %>
@@ -289,19 +290,19 @@ buildvariants:
289290

290291
- name: test-can-bundle-compass-web
291292
display_name: Test Can Bundle Compass Web
292-
run_on: ubuntu2004-large
293+
run_on: ubuntu2204-large
293294
tasks:
294295
- name: test-can-bundle-compass-web
295296

296297
- name: test-web-sandbox-atlas-cloud
297298
display_name: Test Web Sandbox (w/ Atlas Cloud login)
298-
run_on: ubuntu2004-large
299+
run_on: ubuntu2204-large
299300
tasks:
300301
- name: test-web-sandbox-atlas-cloud
301302

302303
- name: generate-vulnerability-report
303304
display_name: Vulnerability Report
304-
run_on: ubuntu2004-large
305+
run_on: ubuntu2204-large
305306
tasks:
306307
- name: generate-vulnerability-report
307308

.evergreen/buildvariants-and-tasks.yml

Lines changed: 15 additions & 15 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
@@ -78,7 +78,7 @@ buildvariants:
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
@@ -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
@@ -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:

0 commit comments

Comments
 (0)