summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-02-28 09:46:27 -0500
committerChris Evich <cevich@redhat.com>2019-02-28 10:01:29 -0500
commit711c0569716b30ef8a027a9412ac5ba6df981230 (patch)
treed7bf8778df0b9e3152187a4aef79413edd196132
parent5afae0b25bba4e2274747b32cf8b3bc929daf06e (diff)
downloadpodman-711c0569716b30ef8a027a9412ac5ba6df981230.tar.gz
podman-711c0569716b30ef8a027a9412ac5ba6df981230.tar.bz2
podman-711c0569716b30ef8a027a9412ac5ba6df981230.zip
[ci skip] Critical note about merge bot
Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r--CONTRIBUTING.md14
1 files changed, 10 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b1b166fef..3778d6d7d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -329,10 +329,16 @@ author hold special privileges on the github repository. Others can be used by
unintentionally. Instead, just write ``LGTM``, or
spell it out.
-* ``[skip ci]``: Within the HEAD commit will cause Cirrus CI to ***NOT*** execute
- tests on the PR. This is useful in basically two cases: 1) You're still working
- and don't want to waste resources. 2) You haven't modified any code that would
- be exercised by the tests. For example, documentation updates (outside of code).
+* ``/hold`` and ``/unhold``: Override the automatic handling of a request. Either
+ put it on hold (no handling) or remove the hold (normal handling).
+
+* ``[ci skip]``: [Adding `[ci skip]` within the HEAD commit](https://cirrus-ci.org/guide/writing-tasks/#conditional-task-execution)
+ will cause Cirrus CI to ***NOT*** execute tests for the PR or after merge. This
+ is useful in only one instance: Your changes are absolutely not exercised by
+ any test. For example, documentation changes. ***IMPORTANT NOTE*** **Other
+ automation may interpret the lack of test results as "PASSED" and unintentionall
+ merge a PR. Consider also using `/hold` in a comment, to add additional
+ protection.**
[The complete list may be found on the command-help page.](https://prow.k8s.io/command-help)
However, not all commands are implemented for this repository. If in doubt, ask a maintainer.