summaryrefslogtreecommitdiffstats
path: root/docs/pull_requests.md
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-14 19:53:30 -0400
committerGitHub <noreply@github.com>2017-06-14 19:53:30 -0400
commit916ea2cadd358e443f57963312a7c22f96d9cd2f (patch)
tree649e3607f19745b1b1b000de2390e7935f78fd8b /docs/pull_requests.md
parent6790ffaebdc6349d844ab3fdc3b3a58e56d63384 (diff)
parentb122e6a655a3a9807ea38741bfc6be6cc5f28436 (diff)
downloadopenshift-916ea2cadd358e443f57963312a7c22f96d9cd2f.tar.gz
openshift-916ea2cadd358e443f57963312a7c22f96d9cd2f.tar.bz2
openshift-916ea2cadd358e443f57963312a7c22f96d9cd2f.tar.xz
openshift-916ea2cadd358e443f57963312a7c22f96d9cd2f.zip
Merge pull request #4422 from jlebon/pr/papr
PAPR updates
Diffstat (limited to 'docs/pull_requests.md')
-rw-r--r--docs/pull_requests.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/pull_requests.md b/docs/pull_requests.md
index fcc3e275c..45ae01a9d 100644
--- a/docs/pull_requests.md
+++ b/docs/pull_requests.md
@@ -10,8 +10,8 @@ Whenever a
[Pull Request is opened](../CONTRIBUTING.md#submitting-contributions), some
automated test jobs must be successfully run before the PR can be merged.
-Some of these jobs are automatically triggered, e.g., Travis and Coveralls.
-Other jobs need to be manually triggered by a member of the
+Some of these jobs are automatically triggered, e.g., Travis, PAPR, and
+Coveralls. Other jobs need to be manually triggered by a member of the
[Team OpenShift Ansible Contributors](https://github.com/orgs/openshift/teams/team-openshift-ansible-contributors).
## Triggering tests
@@ -48,9 +48,9 @@ simplifying the workflow towards a single infrastructure in the future.
There are a set of tests that run on Fedora infrastructure. They are started
automatically with every pull request.
-They are implemented using the [`redhat-ci` framework](https://github.com/jlebon/redhat-ci).
+They are implemented using the [`PAPR` framework](https://github.com/projectatomic/papr).
-To re-run tests, write a comment containing `bot, retest this please`.
+To re-run tests, write a comment containing only `bot, retest this please`.
## Triggering merge