Skip to content
This repository was archived by the owner on Mar 19, 2021. It is now read-only.

Commit 5a6c83e

Browse files
committed
[ci] Split Edge Canary into a separate job
Do not run Edge Canary and Edge Dev in the same job to prevent them from overwriting each other. This also makes Edge setup the same as Safari (two jobs for Safari & STP) on Azure Pipelines.
1 parent 631824b commit 5a6c83e

File tree

1 file changed

+39
-5
lines changed

1 file changed

+39
-5
lines changed

.azure-pipelines.yml

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ jobs:
225225
- template: tools/ci/azure/update_manifest.yml
226226
- script: python ./wpt run --yes --no-manifest-update --install-fonts --manifest MANIFEST.json --metadata infrastructure/metadata/ --log-tbpl - --log-tbpl-level info --channel dev edgechromium infrastructure/
227227
displayName: 'Run tests (Edge Dev)'
228-
- script: python ./wpt run --yes --no-manifest-update --install-fonts --manifest MANIFEST.json --metadata infrastructure/metadata/ --log-tbpl - --log-tbpl-level info --channel canary edgechromium infrastructure/
229-
displayName: 'Run tests (Edge Canary)'
230228
- task: PublishBuildArtifacts@1
231229
displayName: 'Publish results'
232230
inputs:
@@ -237,7 +235,7 @@ jobs:
237235
# All `./wpt run` tests are run from epochs/* branches on a schedule. See
238236
# documentation at the top of this file for required setup.
239237
- job: results_edge
240-
displayName: 'all tests: Edge'
238+
displayName: 'all tests: Edge Dev'
241239
condition: |
242240
or(eq(variables['Build.Reason'], 'Schedule'),
243241
and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_edge']))
@@ -256,12 +254,12 @@ jobs:
256254
packages: virtualenv
257255
- template: tools/ci/azure/install_certs.yml
258256
- template: tools/ci/azure/install_edge.yml
257+
parameters:
258+
channel: dev
259259
- template: tools/ci/azure/update_hosts.yml
260260
- template: tools/ci/azure/update_manifest.yml
261261
- script: python ./wpt run --yes --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --install-fonts --this-chunk $(System.JobPositionInPhase) --total-chunks $(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel dev edgechromium
262262
displayName: 'Run tests (Edge Dev)'
263-
- script: python ./wpt run --yes --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --install-fonts --this-chunk $(System.JobPositionInPhase) --total-chunks $(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel canary edgechromium
264-
displayName: 'Run tests (Edge Canary)'
265263
- task: PublishBuildArtifacts@1
266264
displayName: 'Publish results'
267265
inputs:
@@ -272,6 +270,42 @@ jobs:
272270
dependsOn: results_edge
273271
artifactName: edge-results
274272

273+
- job: results_edge_canary
274+
displayName: 'all tests: Edge Canary'
275+
condition: |
276+
or(eq(variables['Build.Reason'], 'Schedule'),
277+
and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_edge']))
278+
# There are 12 agents in the pool, but use more jobs so that each takes <1h.
279+
strategy:
280+
parallel: 20
281+
timeoutInMinutes: 360
282+
pool:
283+
name: 'Hosted Windows Client'
284+
steps:
285+
- template: tools/ci/azure/system_info.yml
286+
- template: tools/ci/azure/checkout.yml
287+
- template: tools/ci/azure/install_python.yml
288+
- template: tools/ci/azure/pip_install.yml
289+
parameters:
290+
packages: virtualenv
291+
- template: tools/ci/azure/install_certs.yml
292+
- template: tools/ci/azure/install_edge.yml
293+
parameters:
294+
channel: canary
295+
- template: tools/ci/azure/update_hosts.yml
296+
- template: tools/ci/azure/update_manifest.yml
297+
- script: python ./wpt run --yes --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --install-fonts --this-chunk $(System.JobPositionInPhase) --total-chunks $(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel canary edgechromium
298+
displayName: 'Run tests (Edge Canary)'
299+
- task: PublishBuildArtifacts@1
300+
displayName: 'Publish results'
301+
inputs:
302+
artifactName: 'edge-canary-results'
303+
- template: tools/ci/azure/cleanup_win10.yml
304+
- template: tools/ci/azure/fyi_hook.yml
305+
parameters:
306+
dependsOn: results_edge_canary
307+
artifactName: edge-canary-results
308+
275309
- job: results_safari
276310
displayName: 'all tests: Safari'
277311
condition: |

0 commit comments

Comments
 (0)