diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-18 12:29:36 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-04-18 13:17:48 +0200 |
| commit | 2972a991df0e7a0071de1803205814f2d105df46 (patch) | |
| tree | 422db6323a0c3520f6e935e76bc6a261b132e3a7 /doc/ci | |
| parent | 2b1c08be8fa5c18f1fe151feb2a0938734086481 (diff) | |
| download | gitlab-ce-2972a991df0e7a0071de1803205814f2d105df46.tar.gz | |
Add minor fixes in docs for job-specific variables
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/variables/README.md | 3 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 15 |
2 files changed, 7 insertions, 11 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index e1df9e5f543..70fb81492d6 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -4,8 +4,9 @@ When receiving a build from GitLab CI, the runner prepares the build environment It starts by setting a list of **predefined variables** (Environment Variables) and a list of **user-defined variables** The variables can be overwritten. They take precedence over each other in this order: +1. Trigger variables 1. Secure variables -1. YAML-defined job-leve variables +1. YAML-defined job-level variables 1. YAML-defined global variables 1. Predefined variables diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index ea7d6dfa465..61475b45988 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -421,19 +421,14 @@ except master. ### job variables It is possible to define build variables using a `variables` keyword on a job -level. It works basically the same way like it's global-level equivalent but -allows you to define a job specific build variables. +level. It works basically the same way as its global-level equivalent but +allows you to define job-specific build variables. -When `variables` keyword is used on a job level, it can override global YAML +When the `variables` keyword is used on a job level, it overrides global YAML build variables and predefined variables. -Build variables priority is defined as follows: - -* predefined variables -* global YAML variables -* job YAML variables -* secure variables -* trigger variables +Build variables priority is defined in +[variables documentation](../variables/README.md). ### tags |