diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 09:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 09:09:05 +0300 |
commit | 8c9dc985b90c353b33cb829caf51f8320171bc15 (patch) | |
tree | 9a68886dbea1aefabddb46bbd3faf961eab22ae6 /doc | |
parent | 500626a5c953ad81cfc3ed74bf0148c075617e58 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/yaml/README.md | 22 | ||||
-rw-r--r-- | doc/user/clusters/applications.md | 4 | ||||
-rw-r--r-- | doc/user/group/index.md | 3 |
3 files changed, 25 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index a516a3f56f7..1c0e6545bda 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -851,7 +851,7 @@ In this example, if the first rule: - Matches, the job will be given the `when:always` attribute. - Does not match, the second and third rules will be evaluated sequentially until a match is found. That is, the job will be given either the: - - `when: manual` attribute if the second rule matches. + - `when: manual` attribute if the second rule matches. **The stage will not complete until this manual job is triggered and completes successfully.** - `when: on_success` attribute if the second rule does not match. The third rule will always match when reached because it has no conditional clauses. @@ -937,6 +937,25 @@ NOTE: **Note:** For performance reasons, using `exists` with patterns is limited to 10000 checks. After the 10000th check, rules with patterned globs will always match. +#### `rules:allow_failure` + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/30235) in GitLab 12.8. + +You can use [`allow_failure: true`](#allow_failure) within `rules:` to allow a job to fail, or a manual job to +wait for action, without stopping the pipeline itself. All jobs using `rules:` default to `allow_failure: false` +if `allow_failure:` is not defined. + +```yaml +job: + script: "echo Hello, Rules!" + rules: + - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' + when: manual + allow_failure: true +``` + +In this example, if the first rule matches, then the job will have `when: manual` and `allow_failure: true`. + #### Complex rule clauses To conjoin `if`, `changes`, and `exists` clauses with an AND, use them in the @@ -976,6 +995,7 @@ The only job attributes currently set by `rules` are: - `when`. - `start_in`, if `when` is set to `delayed`. +- `allow_failure`. A job will be included in a pipeline if `when` is evaluated to any value except `never`. diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 1794f707abd..60ce03c2fc4 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -464,8 +464,8 @@ chart is used to install this application with a file. NOTE: **Note:** -The chart will deploy 4 Elasticsearch nodes: 2 masters, 1 data and 1 client node, -with resource requests totalling 0.1 CPU and 3GB RAM. Each data node requests 1.5GB of memory, +The chart will deploy 5 Elasticsearch nodes: 2 masters, 2 data and 1 client node, +with resource requests totalling 0.125 CPU and 4.5GB RAM. Each data node requests 1.5GB of memory, which makes it incompatible with clusters of `f1-micro` and `g1-small` instance types. ## Install using GitLab CI (alpha) diff --git a/doc/user/group/index.md b/doc/user/group/index.md index a5383da2e1f..6b76e070c41 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -241,9 +241,10 @@ and give all group members access to the project at once. Alternatively, you can [lock the sharing with group feature](#share-with-group-lock). -## Sharing a group with another group +## Sharing a group with another group **(CORE ONLY)** > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/18328) in GitLab 12.7. +> This feature has been [disabled on GitLab.com](https://gitlab.com/gitlab-com/gl-infra/production/issues/1635). Similarly to [sharing a project with a group](#sharing-a-project-with-a-group), you can share a group with another group to give direct group members access |