Skip to content

Commit

Permalink
Remove mentions of Travis in the wpt GitHub repo
Browse files Browse the repository at this point in the history
Update docs & the comment posted by the exporter to avoid confusion.

Change-Id: I6eab5a9e88f61a99a50dd91d9d6ef3a39105db5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1589058
Auto-Submit: Robert Ma <robertma@chromium.org>
Reviewed-by: Luke Bj <lukebjerring@chromium.org>
Commit-Queue: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#655220}
  • Loading branch information
Hexcles authored and Commit Bot committed Apr 30, 2019
1 parent e9e0a32 commit c31beae
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 35 deletions.
64 changes: 34 additions & 30 deletions docs/testing/web_platform_tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,23 @@ possible, and running as many of the tests as possible.

There is an automatic process for updating the Chromium copy of
web-platform-tests. The import is done by the builder [wpt-importer
builder](https://build.chromium.org/p/chromium.infra.cron/builders/wpt-importer).
builder][wpt-importer].

The easiest way to check the status of recent imports is to look at:

- Recent logs on Buildbot for [wpt-importer
builder](https://build.chromium.org/p/chromium.infra.cron/builders/wpt-importer)
- Recent CLs created by
[blink-w3c-test-autoroller@chromium.org](https://chromium-review.googlesource.com/q/owner:blink-w3c-test-autoroller%40chromium.org).
- Recent logs on LUCI for [wpt-importer builder][wpt-importer]
- Recent CLs created by [WPT
Autoroller](https://chromium-review.googlesource.com/q/owner:wpt-autoroller%2540chops-service-accounts.iam.gserviceaccount.com).

The import jobs will generally be green if either there was nothing to do,
or a CL was successfully submitted.

If the importer starts misbehaving, it could be disabled by turning off the
auto-import mode by landing [this CL](https://crrev.com/c/617479/).
For maintainers:

- The source lives in
[third_party/blink/tools/wpt_import.py](../../third_party/blink/tools/wpt_import.py).
- If the importer starts misbehaving, it could be disabled by turning off the
auto-import mode by landing [this CL](https://crrev.com/c/617479/).

### Failures caused by automatic imports.

Expand All @@ -63,19 +66,22 @@ to have them in the repository (and marked failing) than not, so prefer to
However, if a huge number of tests are failing, please revert the CL so we
can fix it manually.

[wpt-importer]: https://ci.chromium.org/p/infra/builders/luci.infra.cron/wpt-importer

### Automatic export process

If you upload a CL with any changes in
[third_party/blink/web_tests/external/wpt](../../third_party/blink/web_tests/external/wpt),
once you add reviewers the exporter will create a provisional pull request with
those changes in the [upstream WPT GitHub repository](https://github.com/web-platform-tests/wpt/).
The exporter runs on [wpt-exporter builder][wpt-exporter].

Once you're ready to land your CL, please check the Travis CI status on the
upstream PR (link at the bottom of the page). If it's green, go ahead and land your CL
and the exporter will automatically remove the "do not merge yet" label and merge the PR.
Once you're ready to land your CL, please follow the link posted by the bot and
check the status of the required checks of the GitHub PR. If it's green, go
ahead landing your CL and the exporter will automatically merge the PR.

If Travis CI is red on the upstream PR, please try to resolve the failures before
merging. If you run into Travis CI issues, or if you have a CL with WPT changes that
If GitHub status is red on the PR, please try to resolve the failures before
merging. If you run into any issues, or if you have a CL with WPT changes that
the exporter did not pick up, please reach out to ecosystem-infra@chromium.org.

Additional things to note:
Expand All @@ -85,30 +91,17 @@ Additional things to note:
[`chromium-export`](https://github.com/web-platform-tests/wpt/pulls?utf8=%E2%9C%93&q=is%3Apr%20label%3Achromium-export) label.
- All PRs for CLs that haven't yet been landed in Chromium also use the
[`do not merge yet`](https://github.com/web-platform-tests/wpt/pulls?q=is%3Apr+is%3Aopen+label%3A%22do+not+merge+yet%22) label.
- The exporter cannot create upstream PRs for in-flight CLs with binary files (e.g. webm files).
An export PR will still be made after the CL lands.
- The exporter cannot create upstream PRs for in-flight CLs with binary files
(e.g. webm files). An export PR will still be made after the CL lands.

For maintainers:

- The exporter runs continuously under the
[chromium.infra.cron master](https://build.chromium.org/p/chromium.infra.cron/builders/wpt-exporter).
- The source lives in
[third_party/blink/tools/wpt_export.py](../../third_party/blink/tools/wpt_export.py).
- If the exporter starts misbehaving
(for example, creating the same PR over and over again)
put it in "dry run" mode by landing [this CL](https://crrev.com/c/462381/).

### Skipped tests
- If the exporter starts misbehaving (for example, creating the same PR over
and over again), put it in "dry run" mode by landing [this CL](https://crrev.com/c/462381/).

We control which tests are imported via a file called
[W3CImportExpectations](../../third_party/blink/web_tests/W3CImportExpectations),
which has a list of directories to skip while importing.

In addition to the directories and tests explicitly skipped there, tests may
also be skipped for a couple other reasons, e.g. if the file path is too long
for Windows. To check what files are skipped in import, check the recent logs
for [wpt-importer
builder](https://build.chromium.org/p/chromium.infra.cron/builders/wpt-importer).
[wpt-exporter]: https://ci.chromium.org/p/infra/builders/luci.infra.cron/wpt-exporter

### GitHub credentials

Expand Down Expand Up @@ -143,6 +136,17 @@ Remember your import might fail due to GitHub's limit for unauthenticated
requests, so consider [passing your GitHub credentials](#GitHub-credentials) to
the script.

### Skipped tests

We control which tests are imported via a file called
[W3CImportExpectations](../../third_party/blink/web_tests/W3CImportExpectations),
which has a list of directories to skip while importing.

In addition to the directories and tests explicitly skipped there, tests may
also be skipped for a couple other reasons, e.g. if the file path is too long
for Windows. To check what files are skipped in import, check the recent logs
for [wpt-importer builder][wpt-importer].

### Enabling import for a new directory

If you wish to add more tests (by un-skipping some of the directories currently
Expand Down
8 changes: 3 additions & 5 deletions third_party/blink/tools/blinkpy/w3c/test_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,9 @@ def create_or_update_pr_from_inflight_cl(self, cl, pull_request=None):
cl.post_comment((
'Exportable changes to web-platform-tests were detected in this CL '
'and a pull request in the upstream repo has been made: {pr_url}.\n\n'
'If this CL lands and Travis CI upstream is green, we will auto-merge the PR.\n\n'
'Note: Please check the Travis CI status (at the bottom of the PR) '
'before landing this CL and only land this CL if the status is green. '
'Otherwise a human needs to step in and resolve it manually. '
'(This may be automated in the future, see https://crbug.com/711447)\n\n'
'When this CL lands, the bot will automatically merge the PR '
'on GitHub if the required GitHub checks pass; otherwise, '
'ecosystem-infra@ team will triage the failures and may contact you.\n\n'
'WPT Export docs:\n'
'https://chromium.googlesource.com/chromium/src/+/master'
'/docs/testing/web_platform_tests.md#Automatic-export-process'
Expand Down

0 comments on commit c31beae

Please sign in to comment.