diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-14 19:53:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 19:53:30 -0400 |
| commit | 916ea2cadd358e443f57963312a7c22f96d9cd2f (patch) | |
| tree | 649e3607f19745b1b1b000de2390e7935f78fd8b /docs | |
| parent | 6790ffaebdc6349d844ab3fdc3b3a58e56d63384 (diff) | |
| parent | b122e6a655a3a9807ea38741bfc6be6cc5f28436 (diff) | |
| download | openshift-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')
| -rw-r--r-- | docs/pull_requests.md | 8 | ||||
| -rw-r--r-- | docs/repo_structure.md | 13 |
2 files changed, 17 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 diff --git a/docs/repo_structure.md b/docs/repo_structure.md index 693837fba..f598f22c3 100644 --- a/docs/repo_structure.md +++ b/docs/repo_structure.md @@ -52,3 +52,16 @@ These are plugins used in playbooks and roles: . └── test Contains tests. ``` + +### CI + +These files are used by [PAPR](https://github.com/projectatomic/papr), +It is very similar in workflow to Travis, with the test +environment and test scripts defined in a YAML file. + +``` +. +├── .papr.yml +├── .papr.sh +└── .papr.inventory +``` |