This is an automated email from the ASF dual-hosted git repository.

leandron pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git


The following commit(s) were added to refs/heads/main by this push:
     new 0ae3f5d6ce Further clarify CI docs (#11980)
0ae3f5d6ce is described below

commit 0ae3f5d6ce6f150dd038f59429ab1da4fadea177
Author: Andrew Reusch <[email protected]>
AuthorDate: Fri Jul 1 09:02:12 2022 -0700

    Further clarify CI docs (#11980)
---
 ci/README.md           |   2 +-
 ci/jenkins/README.md   | 104 -------------------------------------------------
 docs/contribute/ci.rst |  26 ++++++++++++-
 3 files changed, 26 insertions(+), 106 deletions(-)

diff --git a/ci/README.md b/ci/README.md
index a5cb39016b..3899554923 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -48,7 +48,7 @@ documentation is split like so:
 
 ## Jenkins
 
-Jenkins runs all of the linux-based TVM CI-enabled regression tests. This 
includes tests against accelerated hardware such as GPUs. It excludes those 
regression tests that run against hardware not available in the cloud (those 
tests aren't currently exercised in TVM CI). The tests run by Jenkins represent 
most of the merge-blocking tests (and passing Jenkins should mostly correlate 
with passing the remaining Windows/Mac builds).
+Jenkins runs all of the Linux-based TVM CI-enabled regression tests. This 
includes tests against accelerated hardware such as GPUs. It excludes those 
regression tests that run against hardware not available in the cloud (those 
tests aren't currently exercised in TVM CI). The tests run by Jenkins represent 
most of the merge-blocking tests (and passing Jenkins should mostly correlate 
with passing the remaining Windows/Mac builds).
 
 ## GitHub Actions
 
diff --git a/ci/jenkins/README.md b/ci/jenkins/README.md
index d2a29838b6..6d42770b80 100644
--- a/ci/jenkins/README.md
+++ b/ci/jenkins/README.md
@@ -34,110 +34,6 @@ GitHub Actions is used to run Windows jobs, MacOS jobs, and 
various on-GitHub au
 
 https://github.com/apache/tvm/actions has the logs for each of these 
workflows. Note that when debugging these workflows changes from PRs from 
forked repositories won't be reflected in the PR. These should be tested in the 
forked repository first and linked in the PR body.
 
-
-## Keeping CI Green
-
-Developers rely on the TVM CI to get signal on their PRs before merging.  
Occasionally breakages
-slip through and break `main`, which in turn causes the same error to show up 
on an unrelated PR
-that is based on the broken commit(s). Broken commits can be identified 
[through
-GitHub](https://github.com/apache/tvm/commits/main>) via the commit status 
icon or via
-[Jenkins](https://ci.tlcpack.ai/blue/organizations/jenkins/tvm/activity?branch=main>).
  In these
-situations it is possible to either revert the offending commit or submit a 
forward fix to address
-the issue. It is up to the committer and commit author which option to choose. 
A broken CI affects
-all TVM developers and should be fixed as soon as possible, while a revert may 
be especially painful
-for the author of the offending PR when that PR is large.
-
-Some tests are also flaky and occasionally fail for reasons unrelated to the 
PR. The [CI monitoring
-rotation](https://github.com/apache/tvm/wiki/CI-Monitoring-Runbook) watches 
for these failures and
-disables tests as necessary. It is the responsibility of those who wrote the 
test to ultimately fix
-and re-enable the test.
-
-
-## Dealing with Flakiness
-
-If you notice a failure on your PR that seems unrelated to your change, you 
should
-search [recent GitHub issues related to flaky 
tests](https://github.com/apache/tvm/issues?q=is%3Aissue+%5BCI+Problem%5D+Flaky+>)
 and
-[file a new 
issue](https://github.com/apache/tvm/issues/new?assignees=&labels=&template=ci-problem.md&title=%5BCI+Problem%5D+>)
-if you don't see any reports of the failure. If a certain test or class of 
tests affects
-several PRs or commits on `main` with flaky failures, the test should be 
disabled via
-[pytest's @xfail 
decorator](https://docs.pytest.org/en/6.2.x/skipping.html#xfail-mark-test-functions-as-expected-to-fail)
 with 
[`strict=False`](https://docs.pytest.org/en/6.2.x/skipping.html#strict-parameter)
 and the relevant issue linked in the
-disabling PR.
-
-```python
[email protected](strict=False, reason="Flaky test: 
https://github.com/apache/tvm/issues/1234";)
-    def test_something_flaky():
-        pass
-```
-
-Then submit a PR as usual
-
-```bash
-git add <test file>
-git commit -m'[skip ci][ci] Disable flaky test: `<test_name>`
-
-See #<issue number>
-'
-gh pr create
-```
-
-## Network Resources
-
-Downloading files from the Internet in CI is a big source of flaky failures
-(e.g. remote server goes down or is slow), so try to avoid using the network at
-all during tests. In some cases this isn't a reasonable proposition (e.g. the
-docs tutorials which need to download models). In these cases you can re-host
-files in S3 for fast access in CI. A committer can upload a file, specified by
-a name, hash, and path in S3, using the `workflow_dispatch` event on
-[the `upload_ci_resource.yml` GitHub Actions 
workflow](https://github.com/apache/tvm/actions/workflows/upload_ci_resource.yml).
-The sha256 must match the file or it will not be uploaded. The upload path is
-user-defined so it can be any path (no trailing or leading slashes allowed) but
-be careful not to collide with existing resources on accident.
-
-## Skipping CI
-
-For reverts and trivial forward fixes, adding `[skip ci]` to the revert's
-PR title will cause CI to shortcut and only run lint. Committers should
-take care that they only merge CI-skipped PRs to fix a failure on `main` and
-not in cases where the submitter wants to shortcut CI to merge a change faster.
-The PR title is checked when the build is first run (specifically during the 
lint
-step, so changes after that has run do not affect CI and will require the job 
to
-be re-triggered by another `git push`).
-
-```bash
-# Revert HEAD commit, make sure to insert '[skip ci]' at the beginning of
-# the commit subject
-git revert HEAD
-git checkout -b my_fix
-# After you have pushed your branch, create a PR as usual.
-git push my_repo
-# Example: Skip CI on a branch with an existing PR
-# Adding this commit to an existing branch will cause a new CI run where
-# Jenkins is skipped
-git commit --allow-empty --message "[skip ci] Trigger skipped CI"
-git push my_repo
-```
-
-## Docker Images
-
-Each CI job runs most of its work inside a Docker container, built from files
-in the [`docker/`](../docker) folder. These
-files are built nightly in Jenkins via the 
[docker-images-ci](https://ci.tlcpack.ai/job/docker-images-ci/>) job.
-The images for these containers are hosted in the [tlcpack Docker 
Hub](https://hub.docker.com/u/tlcpack>)
-and referenced in the [`Jenkinsfile.j2`](Jenkinsfile.j2). These can be 
inspected and run
-locally via standard Docker commands.
-
-### `ci-docker-staging`
-
-The [ci-docker-staging](https://github.com/apache/tvm/tree/ci-docker-staging>)
-branch is used to test updates to Docker images and `Jenkinsfile` changes. When
-running a build for a normal PR from a forked repository, Jenkins uses the code
-from the PR except for the `Jenkinsfile` itself, which comes from the base 
branch.
-When branches are built, the `Jenkinsfile` in the branch is used, so a 
committer
-with write access must push PRs to a branch in apache/tvm to properly test
-`Jenkinsfile` changes. If your PR makes changes to the `Jenkinsfile`, make sure
-to @ a [committer](../CONTRIBUTORS.md>)
-and ask them to push your PR as a branch to test the changes.
-
 # Jenkins CI
 
 TVM uses Jenkins for running Linux continuous integration (CI) tests on
diff --git a/docs/contribute/ci.rst b/docs/contribute/ci.rst
index 9a2876220f..a421103ab4 100644
--- a/docs/contribute/ci.rst
+++ b/docs/contribute/ci.rst
@@ -31,7 +31,7 @@ Jenkins is the only CI step that is codified to block 
merging. TVM is also teste
 against Windows and MacOS using GitHub Actions.
 
 This page describes how contributors and committers can use TVM's CI to verify 
their code. You can
-read more about the design of TVM CI in the
+read more about the design of TVM CI in the `tlc-pack/ci 
<https://github.com/tlc-pack/ci>`_ repo.
 
 For Contributors
 ----------------
@@ -164,6 +164,30 @@ be re-triggered by another ``git push``).
    git push my_repo
 
 
+Docker Images
+^^^^^^^^^^^^^
+
+Each CI job runs most of its work inside a Docker container, built from files
+in the `docker/ <https://github.com/apache/tvm/tree/main/docker>`_ folder. 
These
+files are built nightly in Jenkins via the `docker-images-ci 
<https://ci.tlcpack.ai/job/docker-images-ci/>`_ job.
+The images for these containers are hosted in the `tlcpack Docker Hub 
<https://hub.docker.com/u/tlcpack>`_
+and referenced in the `Jenkinsfile.j2 
<https://github.com/apache/tvm/tree/main/Jenkinsfile.j2>`_. These can be 
inspected and run
+locally via standard Docker commands.
+
+
+``ci-docker-staging``
+^^^^^^^^^^^^^^^^^^^^^
+
+The `ci-docker-staging <https://github.com/apache/tvm/tree/ci-docker-staging>`_
+branch is typically used to test updates to Docker images and ``Jenkinsfile`` 
changes. When
+running a build for a normal PR from a forked repository, Jenkins uses the code
+from the PR except for the ``Jenkinsfile`` itself, which comes from the base 
branch.
+When branches are built, the ``Jenkinsfile`` in the branch is used, so a 
committer
+with write access must push PRs to a branch in apache/tvm to properly test
+``Jenkinsfile`` changes. If your PR makes changes to the ``Jenkinsfile``, make 
sure
+to @ a `committer <https://github.com/apache/tvm/tree/main/CONTRIBUTORS.md>`_
+and ask them to push your PR as a branch to test the changes.
+
 
 CI Monitoring Rotation
 ^^^^^^^^^^^^^^^^^^^^^^

Reply via email to