@@ -60,39 +60,6 @@ const PACKAGE_BUILD_VARIANTS = [
6060 }
6161];
6262
63- const SMOKETEST_BUILD_VARIANTS = [
64- {
65- name: 'smoketest-ubuntu',
66- display_name: 'Smoketest Ubuntu',
67- run_on: 'ubuntu2004-large',
68- depends_on: 'package-ubuntu',
69- },
70- {
71- name: 'smoketest-windows',
72- display_name: 'Smoketest Windows',
73- run_on: 'windows-vsCurrent-large',
74- depends_on: 'package-windows',
75- },
76- {
77- name: 'smoketest-rhel',
78- display_name: 'Smoketest RHEL',
79- run_on: 'rhel80-large',
80- depends_on: 'package-rhel',
81- },
82- {
83- name: 'smoketest-macos-x64',
84- display_name: 'Smoketest MacOS Intel',
85- run_on: 'macos-14-gui',
86- depends_on: 'package-macos-x64',
87- },
88- {
89- name: 'smoketest-macos-arm',
90- display_name: 'Smoketest MacOS Arm64',
91- run_on: 'macos-14-arm64-gui',
92- depends_on: 'package-macos-arm',
93- }
94- ];
95-
9663const TEST_PACKAGED_APP_BUILD_VARIANTS = [
9764 {
9865 name: 'test-packaged-app-ubuntu',
@@ -207,7 +174,7 @@ buildvariants:
207174<% for (const buildVariant of PACKAGE_BUILD_VARIANTS) { % >
208175 - name : <%= buildVariant.name %>
209176 expansions :
210- silk_asset_group : <%= buildVariant.silk_asset_group %>
177+ target_platform : <%= buildVariant.target_platform %>
211178 display_name : <%= buildVariant.display_name %>
212179 run_on : <%= buildVariant.run_on %>
213180 tasks :
@@ -216,18 +183,18 @@ buildvariants:
216183 <% } % >
217184<% } % >
218185
219- <% for (const buildVariant of SMOKETEST_BUILD_VARIANTS) { % >
220- <% for (const distribution of ['compass']) { % >
221- - name : <%= buildVariant.name %>-<%= distribution %>
222- display_name : <%= buildVariant.display_name %> (<%= distribution %>)
223- run_on : <%= buildVariant.run_on %>
186+ - name : smoketest-packaged-app
187+ display_name : Smoke Test via GitHub Actions
188+ run_on : ubuntu2004-large
224189 depends_on :
225- - name : package-<%= distribution %>
226- variant : <%= buildVariant.depends_on %>
190+ <% for (const distribution of COMPASS_DISTRIBUTIONS) { % >
191+ <% for (const buildVariant of PACKAGE_BUILD_VARIANTS) { % >
192+ - name : package-<%= distribution %>
193+ variant : <%= buildVariant.name %>
194+ <% } % >
195+ <% } % >
227196 tasks :
228- - name : smoketest-<%= distribution %>
229- <% } % >
230- <% } % >
197+ - name : smoketest-packaged-app
231198
232199 - name : test-eol-servers
233200 display_name : Test EoL Servers
@@ -468,21 +435,17 @@ tasks:
468435 compass_distribution : <%= distribution %>
469436 <% } % >
470437
471- <% for (const distribution of ['compass']) { % >
472- - name : smoketest-<%= distribution %>
438+ - name : smoketest-packaged-app
473439 tags : ['required-for-publish', 'run-on-pr']
474440 commands :
475441 - func : prepare
476442 - func : install
477443 - func : bootstrap
478444 vars :
479- scope : ' compass-e2e -tests'
480- - func : smoketest-packaged-app
445+ scope : ' @mongodb-js/ compass-smoke -tests'
446+ - func : smoketest-on-github-actions
481447 vars :
482- mongodb_version : <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
483- compass_distribution : <%= distribution %>
484448 debug : ' compass-e2e-tests*,electron*,hadron*,mongo*'
485- <% } % >
486449
487450<% for (const serverVersion of SERVER_VERSIONS) { % >
488451 <% for(const group of E2E_TEST_GROUPS) { % >
0 commit comments