summaryrefslogtreecommitdiff
path: root/doc/development/ci_setup.md
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-02-14 19:52:44 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-02-24 20:01:36 -0600
commit1c85d86d19d6cb0cb0da82ea062be3ccd351ffef (patch)
treea9e3413db331ecfdb492752b74f61a95c8f78fdd /doc/development/ci_setup.md
parent7d15f36be6cdefcf95a96bf4cbb425baceaf2488 (diff)
downloadgitlab-ce-mock-ci-service.tar.gz
Add MockCiService integrationmock-ci-service
MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9250/ See https://gitlab.com/madlittlemods/gl-mock-ci-service
Diffstat (limited to 'doc/development/ci_setup.md')
-rw-r--r--doc/development/ci_setup.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/development/ci_setup.md b/doc/development/ci_setup.md
index 2f49b3564ab..b03216fec95 100644
--- a/doc/development/ci_setup.md
+++ b/doc/development/ci_setup.md
@@ -2,11 +2,12 @@
This document describes what services we use for testing GitLab and GitLab CI.
-We currently use three CI services to test GitLab:
+We currently use four CI services to test GitLab:
1. GitLab CI on [GitHost.io](https://gitlab-ce.githost.io/projects/4/) for the [GitLab.com repo](https://gitlab.com/gitlab-org/gitlab-ce)
2. GitLab CI at ci.gitlab.org to test the private GitLab B.V. repo at dev.gitlab.org
3. [Semephore](https://semaphoreapp.com/gitlabhq/gitlabhq/) for [GitHub.com repo](https://github.com/gitlabhq/gitlabhq)
+4. [Mock CI Service](user/project/integrations/mock_ci.md) for local development
| Software @ configuration being tested | GitLab CI (ci.gitlab.org) | GitLab CI (GitHost.io) | Semaphore |
|---------------------------------------|---------------------------|---------------------------------------------------------------------------|-----------|