Skip to content

Commit a429ffc

Browse files
gribnoysupgribnoysup
committed
Merge remote-tracking branch 'origin/main' into 1.35-releases
2 parents e985513 + 6900ac5 commit a429ffc

40 files changed

+1919
-2367
lines changed

‎.evergreen/buildvariants.in.yml‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,32 @@
11
buildvariants:
22
- name: coverage
33
display_name: E2E Coverage
4-
run_on: ubuntu1604-large
4+
run_on: ubuntu2004-large
55
tasks:
66
- name: e2e-coverage
77

88
- name: ubuntu_publish
99
display_name: Publish Artifacts
10-
run_on: ubuntu1604-large
10+
run_on: ubuntu2004-large
1111
tasks:
1212
- name: publish
1313
- name: publish-packages-next
1414

1515
- name: ubuntu_connectivity_tests
1616
display_name: Connectivity Tests
17-
run_on: ubuntu1604-large
17+
run_on: ubuntu2004-large
1818
tasks:
1919
- name: test-connectivity
2020

2121
- name: ubuntu_csfle_tests
2222
display_name: CSFLE Tests
2323
run_on: ubuntu2004-large
2424
tasks:
25-
- name: test-csfle<% for (const buildVariant of buildVariants) { %>
26-
25+
- name: test-csfle
26+
<% for (const buildVariant of buildVariants) { %>
2727
- name: <% out(buildVariant.name) %>
28-
display_name: <% out(buildVariant.display_name) %>
28+
display_name: <% out(buildVariant.display_name) %> (Test and Package)
2929
run_on: <% out(buildVariant.run_on) %>
30-
tasks:
31-
- name: test
32-
- name: test-electron
33-
- name: check
34-
- name: package
35-
- name: package-readonly
36-
- name: package-isolated<% for (const task of buildVariant.tasks) { %>
37-
- name: <% out(task.name) %><% }} %>
30+
tasks:<% for (const task of buildVariant.tasks) { %>
31+
- name: <% out(task.name); task.run_on && out(`\n run_on: ${task.run_on}`); task.depends_on && out(`\n depends_on: ${task.depends_on}`); %>
32+
<% }} %>

‎.evergreen/buildvariants.yml‎

Lines changed: 147 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
buildvariants:
22
- name: coverage
33
display_name: E2E Coverage
4-
run_on: ubuntu1604-large
4+
run_on: ubuntu2004-large
55
tasks:
66
- name: e2e-coverage
77

88
- name: ubuntu_publish
99
display_name: Publish Artifacts
10-
run_on: ubuntu1604-large
10+
run_on: ubuntu2004-large
1111
tasks:
1212
- name: publish
1313
- name: publish-packages-next
1414

1515
- name: ubuntu_connectivity_tests
1616
display_name: Connectivity Tests
17-
run_on: ubuntu1604-large
17+
run_on: ubuntu2004-large
1818
tasks:
1919
- name: test-connectivity
2020

@@ -24,83 +24,195 @@ buildvariants:
2424
tasks:
2525
- name: test-csfle
2626

27-
- name: windows
28-
display_name: Windows (Test and Package)
29-
run_on: windows-vsCurrent-large
27+
- name: ubuntu
28+
display_name: Ubuntu 20.04 (Test and Package)
29+
run_on: ubuntu2004-large
3030
tasks:
31+
- name: check
32+
3133
- name: test
34+
3235
- name: test-electron
33-
- name: check
34-
- name: package
35-
- name: package-readonly
36-
- name: package-isolated
36+
37+
- name: package-compass
38+
run_on: ubuntu1604-large
39+
40+
- name: package-compass-readonly
41+
run_on: ubuntu1604-large
42+
43+
- name: package-compass-isolated
44+
run_on: ubuntu1604-large
45+
3746
- name: test-packaged-app-40x-community
47+
depends_on: package-compass
48+
3849
- name: test-packaged-app-40x-enterprise
50+
run_on: ubuntu1804-large
51+
depends_on: package-compass
52+
3953
- name: test-packaged-app-42x-community
54+
depends_on: package-compass
55+
4056
- name: test-packaged-app-42x-enterprise
57+
run_on: ubuntu1804-large
58+
depends_on: package-compass
59+
4160
- name: test-packaged-app-44x-community
61+
depends_on: package-compass
62+
4263
- name: test-packaged-app-44x-enterprise
64+
depends_on: package-compass
65+
4366
- name: test-packaged-app-5x-community
67+
depends_on: package-compass
68+
4469
- name: test-packaged-app-5x-enterprise
70+
depends_on: package-compass
71+
72+
- name: test-packaged-app-60x-community
73+
depends_on: package-compass
74+
4575
- name: test-packaged-app-60x-enterprise
76+
depends_on: package-compass
4677

47-
- name: ubuntu
48-
display_name: Ubuntu (Test and Package)
49-
run_on: ubuntu1604-large
78+
- name: windows
79+
display_name: Windows 10 (Test and Package)
80+
run_on: windows-vsCurrent-large
5081
tasks:
82+
- name: check
83+
5184
- name: test
85+
5286
- name: test-electron
53-
- name: check
54-
- name: package
55-
- name: package-readonly
56-
- name: package-isolated
87+
88+
- name: package-compass
89+
90+
- name: package-compass-readonly
91+
92+
- name: package-compass-isolated
93+
5794
- name: test-packaged-app-40x-community
95+
depends_on: package-compass
96+
5897
- name: test-packaged-app-40x-enterprise
98+
depends_on: package-compass
99+
59100
- name: test-packaged-app-42x-community
101+
depends_on: package-compass
102+
60103
- name: test-packaged-app-42x-enterprise
104+
depends_on: package-compass
105+
61106
- name: test-packaged-app-44x-community
107+
depends_on: package-compass
108+
62109
- name: test-packaged-app-44x-enterprise
110+
depends_on: package-compass
111+
112+
- name: test-packaged-app-5x-community
113+
depends_on: package-compass
114+
115+
- name: test-packaged-app-5x-enterprise
116+
depends_on: package-compass
117+
118+
- name: test-packaged-app-60x-community
119+
depends_on: package-compass
120+
121+
- name: test-packaged-app-60x-enterprise
122+
depends_on: package-compass
63123

64124
- name: rhel
65-
display_name: RHEL (Test and Package)
125+
display_name: RHEL 7.6 (Test and Package)
66126
run_on: rhel76-large
67127
tasks:
128+
- name: check
129+
68130
- name: test
131+
69132
- name: test-electron
70-
- name: check
71-
- name: package
72-
- name: package-readonly
73-
- name: package-isolated
133+
134+
- name: package-compass
135+
136+
- name: package-compass-readonly
137+
138+
- name: package-compass-isolated
139+
74140
- name: test-packaged-app-40x-community
141+
depends_on: package-compass
142+
75143
- name: test-packaged-app-40x-enterprise
144+
depends_on: package-compass
145+
76146
- name: test-packaged-app-42x-community
147+
depends_on: package-compass
148+
77149
- name: test-packaged-app-42x-enterprise
150+
depends_on: package-compass
151+
78152
- name: test-packaged-app-44x-community
153+
depends_on: package-compass
154+
79155
- name: test-packaged-app-44x-enterprise
156+
depends_on: package-compass
157+
80158
- name: test-packaged-app-5x-community
159+
depends_on: package-compass
160+
81161
- name: test-packaged-app-5x-enterprise
162+
depends_on: package-compass
163+
164+
- name: test-packaged-app-60x-community
165+
depends_on: package-compass
166+
82167
- name: test-packaged-app-60x-enterprise
168+
depends_on: package-compass
83169

84170
- name: macos
85-
display_name: MacOS x64 (Test and Package)
86-
run_on: macos-1100-gui
171+
display_name: MacOS x64 11.00 (Test and Package)
172+
run_on: macos-1100
87173
tasks:
174+
- name: check
175+
88176
- name: test
177+
89178
- name: test-electron
90-
- name: check
91-
- name: package
92-
- name: package-readonly
93-
- name: package-isolated
179+
run_on: macos-1100-gui
180+
181+
- name: package-compass
182+
183+
- name: package-compass-readonly
184+
185+
- name: package-compass-isolated
186+
187+
- name: test-packaged-app-60x-community
188+
run_on: macos-1100-gui
189+
depends_on: package-compass
190+
94191
- name: test-packaged-app-60x-enterprise
192+
run_on: macos-1100-gui
193+
depends_on: package-compass
95194

96-
- name: macos_arm64
97-
display_name: MacOS arm64 (Test and Package)
98-
run_on: macos-1100-arm64-gui
195+
- name: macos-arm
196+
display_name: MacOS arm64 11.00 (Test and Package)
197+
run_on: macos-1100-arm64
99198
tasks:
199+
- name: check
200+
100201
- name: test
202+
101203
- name: test-electron
102-
- name: check
103-
- name: package
104-
- name: package-readonly
105-
- name: package-isolated
204+
run_on: macos-1100-arm64-gui
205+
206+
- name: package-compass
207+
208+
- name: package-compass-readonly
209+
210+
- name: package-compass-isolated
211+
212+
- name: test-packaged-app-60x-community
213+
run_on: macos-1100-arm64-gui
214+
depends_on: package-compass
215+
106216
- name: test-packaged-app-60x-enterprise
217+
run_on: macos-1100-arm64-gui
218+
depends_on: package-compass

0 commit comments

Comments
 (0)