diff options
| author | Mark Pundsack <mpundsack@gitlab.com> | 2017-02-06 17:30:55 -0600 |
|---|---|---|
| committer | Mark Pundsack <mpundsack@gitlab.com> | 2017-02-06 17:30:55 -0600 |
| commit | 4a38a3bb2fc0abaad175d9287e17998b6c5bb93b (patch) | |
| tree | ab66dc7eb8b857d89dda7f77adcf76ccd2998a9e /doc/ci/pipelines.md | |
| parent | e278feb2158cbe9595e2afc9da019d97b40e1cdc (diff) | |
| download | gitlab-ce-4a38a3bb2fc0abaad175d9287e17998b6c5bb93b.tar.gz | |
Add development workflows
Diffstat (limited to 'doc/ci/pipelines.md')
| -rw-r--r-- | doc/ci/pipelines.md | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md index d099628c012..0a9f4631614 100644 --- a/doc/ci/pipelines.md +++ b/doc/ci/pipelines.md @@ -13,7 +13,7 @@ executed.  -### Types of Pipelines +## 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. @@ -23,6 +23,18 @@ There are three types of pipelines that often use the single shorthand of "pipel 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. +## Development Workflows + +Pipelines accommodate several development workflows: + +1. **Branch Flow** (e.g. different branch for dev, qa, staging, production) +2. **Trunk-based Flow** (e.g. feature branches and single master branch, possibly with tags for releases) +3. **Fork-based Flow** (e.g. merge requests come from forks) + +Example flow: + + + ## Builds Builds are individual runs of [jobs]. Not to be confused with a `build` job or |