summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-09-01 13:42:10 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-09-01 13:42:10 +0200
commit84827c1387a66970cbbbec28ae7ea56e9e4fa01e (patch)
treec8c8e8fc793626eccd87a2bb3b72c29415409a4a
parent6f6583923f757b830520846f3a5ae8c6983dc40b (diff)
downloadgitlab-ce-84827c1387a66970cbbbec28ae7ea56e9e4fa01e.tar.gz
Add some basic docs about kubernetes: active feature
-rw-r--r--doc/ci/yaml/README.md35
1 files changed, 31 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index abf4ec7dbf8..eaf2c557a1e 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -427,16 +427,16 @@ a "key: value" pair. Be careful when using special characters:
are executed in `parallel`. For more info about the use of `stage` please check
[stages](#stages).
-### only and except
+### only and except (simplified)
-`only` and `except` are two parameters that set a refs policy to limit when
-jobs are built:
+`only` and `except` are two parameters that set a job policy to limit when
+jobs are created:
1. `only` defines the names of branches and tags for which the job will run.
2. `except` defines the names of branches and tags for which the job will
**not** run.
-There are a few rules that apply to the usage of refs policy:
+There are a few rules that apply to the usage of job policy:
* `only` and `except` are inclusive. If both `only` and `except` are defined
in a job specification, the ref is filtered by `only` and `except`.
@@ -497,6 +497,33 @@ job:
The above example will run `job` for all branches on `gitlab-org/gitlab-ce`,
except master.
+### only and except (complex)
+
+> Introduced in GitLab 10.0
+
+Since GitLab 10.0 it is possible to define a complex only/except job policy
+configuration.
+
+GitLab now supports both, simple and complex strategies, so it is possible to
+use array and hash scheme configuration.
+
+Two keys are now available: `refs` and `kubernetes`. Refs strategy equals to
+simplified only/except configuration, whereas kubernetes strategy accepts only
+`active` keyword.
+
+See the example below. Job is going to be created only when pipeline has been
+scheduled or runs for a `master` branch, and only if kubernetes service is
+active in the project.
+
+```yaml
+job:
+ only:
+ refs:
+ - master
+ - schedules
+ kubernetes: active
+```
+
### Job variables
It is possible to define job variables using a `variables` keyword on a job