aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Ravi Mistry <rmistry@google.com>2017-05-23 14:35:35 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-23 20:28:54 +0000
commitc823fb598b2fa54a2c9bdede153ead8bd54c646f (patch)
tree47e13ac15447d452a0431c841162fad8fb853e38
parent8a030557bd9cd66860d605578d4c54651ff02383 (diff)
Update documentation to specify the new Gerrit style CQ keywords
BUG=skia:6667 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=17762 Change-Id: I440b5565589102ae6026b5da4716fd43d4a48d6a Reviewed-on: https://skia-review.googlesource.com/17762 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>
-rw-r--r--site/dev/contrib/cqkeywords.md31
-rw-r--r--site/dev/sheriffing/index.md2
2 files changed, 12 insertions, 21 deletions
diff --git a/site/dev/contrib/cqkeywords.md b/site/dev/contrib/cqkeywords.md
index e10dc9bb89..b21b787eb1 100644
--- a/site/dev/contrib/cqkeywords.md
+++ b/site/dev/contrib/cqkeywords.md
@@ -14,10 +14,10 @@ To do a dry run through the CQ please use Gerrit's [CQ Dry Run](https://groups.g
The CQ will run through its list of verifiers (reviewer check, trybots, tree check,
presubmit check), and will close the issue instead of committing it.
-NO_DEPENDENCY_CHECKS
+No-Dependency-Checks
--------------------
- NO_DEPENDENCY_CHECKS=true
+ No-Dependency-Checks: true
The CQ rejects patchsets with open dependencies. An open dependency exists when a CL
depends on another CL that is not yet closed. You can skip this check with this keyword.
@@ -38,40 +38,31 @@ Here are some real world examples:
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE
-TBR
----
-If you are a Skia committer and cannot wait for a review,
-then you can include the TBR keyword in your CL's description.
-
-Example:
-
- TBR=rmistry@google.com
-
-NOTREECHECKS
-------------
+No-Tree-Checks
+--------------
If you want to skip the tree status checks, to make the CQ commit a CL even if the tree is closed,
you can add the following line to the CL description:
- NOTREECHECKS=true
+ No-Tree-Checks: true
This is discouraged, since the tree is closed for a reason. However, in rare cases this is acceptable,
primarily to fix build breakages (i.e., your CL will help in reopening the tree).
-NOPRESUBMIT
------------
+No-Presubmit
+------------
If you want to skip the presubmit checks, add the following line to the CL description:
- NOPRESUBMIT=true
+ No-Presubmit: true
-NOTRY
------
+No-Try
+------
If you cannot wait for the try job results, you can add the following line to the CL description:
- NOTRY=true
+ No-Try: true
The CQ will then not run any try jobs for your change and will commit the CL as soon as the tree is open, assuming the presubmit check passes.
diff --git a/site/dev/sheriffing/index.md b/site/dev/sheriffing/index.md
index af3fda7d9e..6ad276da03 100644
--- a/site/dev/sheriffing/index.md
+++ b/site/dev/sheriffing/index.md
@@ -114,7 +114,7 @@ Look at all existing [BreakingTheBuildbots bugs](https://bug.skia.org/?q=label:B
### How to submit when the tree is closed
* Submit manually using the "git cl land" with the --bypass-hooks flag.
-* Add "NOTREECHECKS=true" to your CL description and use the CQ as usual.
+* Add "No-Tree-Checks: true" to your CL description and use the CQ as usual.
<a name="tree_closers"></a>