Skip to content

Commit fdad1bd

Browse files
authored
chore: build on 1604, test on 2004 (#3074)
* build on 1604, test on 2004 * specify correct variants
1 parent a670f92 commit fdad1bd

File tree

5 files changed

+482
-85
lines changed

5 files changed

+482
-85
lines changed

.evergreen/buildvariants.in.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,21 @@ buildvariants:
4444
display_name: CSFLE Tests
4545
run_on: ubuntu2004-large
4646
tasks:
47-
- name: test-csfle<% for (const buildVariant of buildVariants) { %>
47+
- name: test-csfle<% for (const packageVariant of packageVariants) { %>
4848

49-
- name: <% out(buildVariant.name) %>
50-
display_name: <% out(buildVariant.display_name) %>
51-
run_on: <% out(buildVariant.run_on) %>
49+
- name: <% out(packageVariant.name) %>
50+
display_name: <% out(packageVariant.display_name) %>
51+
run_on: <% out(packageVariant.run_on) %>
5252
tasks:
5353
- name: test
5454
- name: test-electron
5555
- name: check
5656
- name: package
5757
- name: package-readonly
58-
- name: package-isolated<% for (const task of buildVariant.tasks) { %>
59-
- name: <% out(task.name) %><% }} %>
58+
- name: package-isolated<% } for (const e2eVariant of e2eVariants) { %>
59+
60+
- name: <% out(e2eVariant.name) %>
61+
display_name: <% out(e2eVariant.display_name) %>
62+
run_on: <% out(e2eVariant.run_on) %>
63+
tasks:<% for (const task of e2eVariant.tasks) { %>
64+
- name: <% out(`${task.name}`) %><% }} %>

.evergreen/buildvariants.yml

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ buildvariants:
4646
tasks:
4747
- name: test-csfle
4848

49-
- name: windows
50-
display_name: Windows (Test and Package)
49+
- name: windows_package
50+
display_name: windows (Test and Package)
5151
run_on: windows-vsCurrent-large
5252
tasks:
5353
- name: test
@@ -56,34 +56,20 @@ buildvariants:
5656
- name: package
5757
- name: package-readonly
5858
- name: package-isolated
59-
- name: test-packaged-app-40x-community
60-
- name: test-packaged-app-40x-enterprise
61-
- name: test-packaged-app-42x-community
62-
- name: test-packaged-app-42x-enterprise
63-
- name: test-packaged-app-44x-community
64-
- name: test-packaged-app-44x-enterprise
65-
- name: test-packaged-app-5x-community
66-
- name: test-packaged-app-5x-enterprise
6759

68-
- name: ubuntu
69-
display_name: Ubuntu (Test and Package)
70-
run_on: ubuntu2004-large
60+
- name: ubuntu_package
61+
display_name: ubuntu (Test and Package)
62+
run_on: ubuntu1604-large
7163
tasks:
7264
- name: test
7365
- name: test-electron
7466
- name: check
7567
- name: package
7668
- name: package-readonly
7769
- name: package-isolated
78-
- name: test-packaged-app-40x-community
79-
- name: test-packaged-app-42x-community
80-
- name: test-packaged-app-44x-community
81-
- name: test-packaged-app-44x-enterprise
82-
- name: test-packaged-app-5x-community
83-
- name: test-packaged-app-5x-enterprise
8470

85-
- name: rhel
86-
display_name: RHEL (Test and Package)
71+
- name: rhel_package
72+
display_name: rhel (Test and Package)
8773
run_on: rhel76-large
8874
tasks:
8975
- name: test
@@ -92,11 +78,40 @@ buildvariants:
9278
- name: package
9379
- name: package-readonly
9480
- name: package-isolated
95-
- name: test-packaged-app-40x-community
96-
- name: test-packaged-app-40x-enterprise
97-
- name: test-packaged-app-42x-community
98-
- name: test-packaged-app-42x-enterprise
99-
- name: test-packaged-app-44x-community
100-
- name: test-packaged-app-44x-enterprise
101-
- name: test-packaged-app-5x-community
102-
- name: test-packaged-app-5x-enterprise
81+
82+
- name: windows_e2e
83+
display_name: windows (E2E)
84+
run_on: windows-vsCurrent-large
85+
tasks:
86+
- name: windows_e2e_test-packaged-app-40x-community
87+
- name: windows_e2e_test-packaged-app-40x-enterprise
88+
- name: windows_e2e_test-packaged-app-42x-community
89+
- name: windows_e2e_test-packaged-app-42x-enterprise
90+
- name: windows_e2e_test-packaged-app-44x-community
91+
- name: windows_e2e_test-packaged-app-44x-enterprise
92+
- name: windows_e2e_test-packaged-app-5x-community
93+
- name: windows_e2e_test-packaged-app-5x-enterprise
94+
95+
- name: ubuntu_e2e
96+
display_name: ubuntu (E2E)
97+
run_on: ubuntu2004-large
98+
tasks:
99+
- name: ubuntu_e2e_test-packaged-app-40x-community
100+
- name: ubuntu_e2e_test-packaged-app-42x-community
101+
- name: ubuntu_e2e_test-packaged-app-44x-community
102+
- name: ubuntu_e2e_test-packaged-app-44x-enterprise
103+
- name: ubuntu_e2e_test-packaged-app-5x-community
104+
- name: ubuntu_e2e_test-packaged-app-5x-enterprise
105+
106+
- name: rhel_e2e
107+
display_name: rhel (E2E)
108+
run_on: rhel76-large
109+
tasks:
110+
- name: rhel_e2e_test-packaged-app-40x-community
111+
- name: rhel_e2e_test-packaged-app-40x-enterprise
112+
- name: rhel_e2e_test-packaged-app-42x-community
113+
- name: rhel_e2e_test-packaged-app-42x-enterprise
114+
- name: rhel_e2e_test-packaged-app-44x-community
115+
- name: rhel_e2e_test-packaged-app-44x-enterprise
116+
- name: rhel_e2e_test-packaged-app-5x-community
117+
- name: rhel_e2e_test-packaged-app-5x-enterprise

.evergreen/tasks.in.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ tasks:
4545
- func: save-windows-artifacts
4646
vars:
4747
compass_distribution: compass
48-
variants: [windows]
48+
variants: [windows_package]
4949
- func: save-macos-artifacts
5050
vars:
5151
compass_distribution: compass
52-
variants: [macos]
52+
variants: [macos_package]
5353
- func: save-rhel-artifacts
5454
vars:
5555
compass_distribution: compass
56-
variants: [rhel]
56+
variants: [rhel_package]
5757
- func: save-ubuntu-artifacts
5858
vars:
5959
compass_distribution: compass
60-
variants: [ubuntu]
60+
variants: [ubuntu_package]
6161

6262
- name: package-isolated
6363
tags: ['required-for-publish', 'run-on-pr']
@@ -77,19 +77,19 @@ tasks:
7777
- func: save-windows-artifacts
7878
vars:
7979
compass_distribution: compass-isolated
80-
variants: [windows]
80+
variants: [windows_package]
8181
- func: save-macos-artifacts
8282
vars:
8383
compass_distribution: compass-isolated
84-
variants: [macos]
84+
variants: [macos_package]
8585
- func: save-rhel-artifacts
8686
vars:
8787
compass_distribution: compass-isolated
88-
variants: [rhel]
88+
variants: [rhel_package]
8989
- func: save-ubuntu-artifacts
9090
vars:
9191
compass_distribution: compass-isolated
92-
variants: [ubuntu]
92+
variants: [ubuntu_package]
9393

9494
- name: package-readonly
9595
tags: ['required-for-publish', 'run-on-pr']
@@ -109,19 +109,19 @@ tasks:
109109
- func: save-windows-artifacts
110110
vars:
111111
compass_distribution: compass-readonly
112-
variants: [windows]
112+
variants: [windows_package]
113113
- func: save-macos-artifacts
114114
vars:
115115
compass_distribution: compass-readonly
116-
variants: [macos]
116+
variants: [macos_package]
117117
- func: save-rhel-artifacts
118118
vars:
119119
compass_distribution: compass-readonly
120-
variants: [rhel]
120+
variants: [rhel_package]
121121
- func: save-ubuntu-artifacts
122122
vars:
123123
compass_distribution: compass-readonly
124-
variants: [ubuntu]
124+
variants: [ubuntu_package]
125125

126126
- name: test-connectivity
127127
tags: ['required-for-publish']
@@ -277,12 +277,13 @@ tasks:
277277
target_platform: '--platform=darwin'
278278

279279
# copied as test-packaged-app-macos due to depends_on variation
280-
<% for (const task of testPackagedAppVariations) { %>
280+
<% for (const task of allTestPackagedAppTasks) { %>
281281

282282
- name: <% out(task.name) %>
283283
tags: ['required-for-publish', 'run-on-pr']
284284
depends_on:
285-
- name: package
285+
name: package
286+
variant: <% out(task.dependVariantName) %>
286287
commands:
287288
- func: prepare
288289
- func: install

0 commit comments

Comments
 (0)