summaryrefslogtreecommitdiff
path: root/doc/ci/yaml
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-03-19 08:15:33 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-03-19 08:15:33 +0000
commit066cdc191d60060dbbb052c21e8e6fb98cc6ca0b (patch)
tree05f56cdb6c0bbd3e17d5b85113c315441369b26e /doc/ci/yaml
parentaa23141db54e550453d896d2cb2c3e7aa8f49dfa (diff)
downloadgitlab-ce-066cdc191d60060dbbb052c21e8e6fb98cc6ca0b.tar.gz
Refactor new content for stage keyword
Diffstat (limited to 'doc/ci/yaml')
-rw-r--r--doc/ci/yaml/README.md19
1 files changed, 12 insertions, 7 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index fe2598f6a91..e1045864db7 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -268,15 +268,9 @@ There are also two edge cases worth mentioning:
### `stage`
-NOTE: **Note:**
-By default, when using your own Runners, the GitLab Runner installation is set up to run only one job at a time (see the `concurrent` flag in [Runner global settings](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-global-section) for more information).
-Jobs will run in parallel only if:
- - Run on different Runners
- - The Runner's `concurrent` config has been changed.
-
`stage` is defined per-job and relies on [`stages`](#stages) which is defined
globally. It allows to group jobs into different stages, and jobs of the same
-`stage` are executed in `parallel`. For example:
+`stage` are executed in parallel (subject to [certain conditions](#using-your-own-runners)). For example:
```yaml
stages:
@@ -301,6 +295,17 @@ job 4:
script: make deploy
```
+#### Using your own Runners
+
+When using your own Runners, GitLab Runner runs only one job at a time by default (see the
+`concurrent` flag in [Runner global settings](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-global-section)
+for more information).
+
+Jobs will run on your own Runners in parallel only if:
+
+- Run on different Runners.
+- The Runner's `concurrent` setting has been changed.
+
### `only`/`except` (basic)
`only` and `except` are two parameters that set a job policy to limit when