diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-15 13:09:23 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-15 13:09:23 +0000 |
| commit | 3f1c95c6384ef69aaae9d0b30a50395c31d1196a (patch) | |
| tree | 833061d97614aa4c75c070dc3fd528d05ec9265e | |
| parent | 381a6283a9d27ccf0a8d43f33ec01b720ec6a1bf (diff) | |
| parent | af609805c5e6a97893cf1a02d8fb043fff183656 (diff) | |
| download | gitlab-ce-3f1c95c6384ef69aaae9d0b30a50395c31d1196a.tar.gz | |
Merge branch 'no_red_builds_policy' into 'master'
No red builds policy
Related to gitlab/organization#63
See merge request !1182
| -rw-r--r-- | CONTRIBUTING.md | 1 | ||||
| -rw-r--r-- | doc/development/ci_setup.md | 20 |
2 files changed, 12 insertions, 9 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ed49080d57a..ce454a11a08 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,6 +92,7 @@ For examples of feedback on merge requests please look at already [closed merge 1. The change is as small as possible (see the above paragraph for details) 1. Include proper tests and make all tests pass (unless it contains a test exposing a bug in existing code) +1. All tests have to pass, if you suspect a failing CI build is unrelated to your contribution ask for tests to be restarted. See [the CI setup document](http://doc.gitlab.com/ce/development/ci_setup.html) on who you can ask for test restart. 1. Initially contains a single commit (please use `git rebase -i` to squash commits) 1. Can merge without problems (if not please merge `master`, never rebase commits pushed to the remote server) 1. Does not break any existing functionality diff --git a/doc/development/ci_setup.md b/doc/development/ci_setup.md index b3e84183a41..d74f4852a3d 100644 --- a/doc/development/ci_setup.md +++ b/doc/development/ci_setup.md @@ -9,15 +9,17 @@ We currently use three CI services to test GitLab: 3. [Semephore](https://semaphoreapp.com/gitlabhq/gitlabhq/) for [GitHub.com repo](https://github.com/gitlabhq/gitlabhq) | Software @ configuration being tested | GitLab CI (ci.gitlab.org) | GitLab CI (GitHost.io) | Semaphore | -|---------------------------------------|---------------------------|------------------------|-----------| -| GitLab CE @ MySQL | ✓ | ✓ | | -| GitLab CE @ PostgreSQL | | | ✓ | -| GitLab EE @ MySQL | ✓ | | | -| GitLab CI @ MySQL | ✓ | | | -| GitLab CI @ PostgreSQL | | | ✓ | -| GitLab CI Runner | ✓ | | ✓ | -| GitLab Shell | ✓ | | ✓ | -| GitLab Shell | ✓ | | ✓ | +|---------------------------------------|---------------------------|---------------------------------------------------------------------------|-----------| +| GitLab CE @ MySQL | ✓ | ✓ [Core team can trigger builds](https://gitlab-ce.githost.io/projects/4) | | +| GitLab CE @ PostgreSQL | | | ✓ [Core team can trigger builds](https://semaphoreapp.com/gitlabhq/gitlabhq/branches/master) | +| GitLab EE @ MySQL | ✓ | | | +| GitLab CI @ MySQL | ✓ | | | +| GitLab CI @ PostgreSQL | | | ✓ | +| GitLab CI Runner | ✓ | | ✓ | +| GitLab Shell | ✓ | | ✓ | +| GitLab Shell | ✓ | | ✓ | + +Core team has access to trigger builds if needed for GitLab CE. We use [these build scripts](https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/examples/build_script_gitlab_ce.md) for testing with GitLab CI. |