summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-04-17 20:08:02 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-04-18 13:17:48 +0200
commita2957291b3a28eff3988dfc8bdcff4b99b20a1b3 (patch)
tree6c6eacd86b7caeb0af74bf68e0fa32ddd5c754f0 /doc/ci
parenta2649739055842ce519fab5a8b0c68dbf23cb35a (diff)
downloadgitlab-ce-a2957291b3a28eff3988dfc8bdcff4b99b20a1b3.tar.gz
Update documentation on job level build variables
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/variables/README.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index f321a618f3b..e1df9e5f543 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -1,17 +1,19 @@
## Variables
+
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. Secure variables
-1. YAML-defined variables
+1. YAML-defined job-leve variables
+1. YAML-defined global variables
1. Predefined variables
For example, if you define:
-1. API_TOKEN=SECURE as Secure Variable
-1. API_TOKEN=YAML as YAML-defined variable
+1. `API_TOKEN=SECURE` as Secure Variable
+1. `API_TOKEN=YAML` as YAML-defined variable
-The API_TOKEN will take the Secure Variable value: `SECURE`.
+The `API_TOKEN` will take the Secure Variable value: `SECURE`.
### Predefined variables (Environment Variables)