summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pundsack <mpundsack@gitlab.com>2017-02-06 16:49:23 -0600
committerMark Pundsack <mpundsack@gitlab.com>2017-02-06 16:49:23 -0600
commit345e94fdf9b99a15d65856abd1532eda256e2639 (patch)
tree0d368e6e05dedb43de4dad4e0cc4f238717b022c
parentf54917f118f78e08f813d451c152c2571d159829 (diff)
downloadgitlab-ce-345e94fdf9b99a15d65856abd1532eda256e2639.tar.gz
Document types of pipelines
-rw-r--r--doc/ci/pipelines.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md
index f91b9d350f7..590748cf9a7 100644
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
@@ -13,6 +13,16 @@ executed.
![Pipelines example](img/pipelines.png)
+### Types of Pipelines
+
+There are three types of pipelines that often use the single shorthand of "pipeline". People often talk about them as if each one is "the" pipeline, but really, they're just pieces of a single, comprehensive pipeline.
+
+![](/images/direction/cicd/types-of-pipelines.svg)
+
+1. **CI Pipeline**: Build and test stages defined in `.gitlab-ci.yml`
+2. **Deploy Pipeline**: Deploy stage(s) defined in `.gitlab-ci.yml` The flow of deploying code to servers through various stages: e.g. development to staging to production
+3. **Project Pipeline**: Cross-project CI dependencies [triggered via API]((triggers)), particularly for micro-services, but also for complicated build dependencies: e.g. api -> front-end, ce/ee -> omnibus.
+
## Builds
Builds are individual runs of [jobs]. Not to be confused with a `build` job or