diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 03:06:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 03:06:04 +0300 |
commit | da2b29721331e9c75cd3170770b0b349e8401287 (patch) | |
tree | 8b0c79f945fd0e73b4966f3c24fb72288f41b997 /doc/ci | |
parent | e7c9b53c76d2673e6409dda59a5f738808379588 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r-- | doc/ci/directed_acyclic_graph/index.md | 2 | ||||
-rw-r--r-- | doc/ci/multi_project_pipelines.md | 8 | ||||
-rw-r--r-- | doc/ci/yaml/README.md | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/doc/ci/directed_acyclic_graph/index.md b/doc/ci/directed_acyclic_graph/index.md index a438d22d519..7215dec287e 100644 --- a/doc/ci/directed_acyclic_graph/index.md +++ b/doc/ci/directed_acyclic_graph/index.md @@ -73,4 +73,4 @@ A directed acyclic graph is a complicated feature, and as of the initial MVC the are certain use cases that you may need to work around. For more information: - [`needs` requirements and limitations](../yaml/README.md#requirements-and-limitations). -- Related epic [#1716](https://gitlab.com/groups/gitlab-org/-/epics/1716). +- Related epic [tracking planned improvements](https://gitlab.com/groups/gitlab-org/-/epics/1716). diff --git a/doc/ci/multi_project_pipelines.md b/doc/ci/multi_project_pipelines.md index 4ca6547747b..762980a977c 100644 --- a/doc/ci/multi_project_pipelines.md +++ b/doc/ci/multi_project_pipelines.md @@ -115,9 +115,11 @@ staging: branch: stable-11-2 ``` -Use a `project` keyword to specify full path to a downstream project. Use -a `branch` keyword to specify a branch name. Variable expansion is supported in -the `branch` property. +Use: + +- The `project` keyword to specify the full path to a downstream project. +- The `branch` keyword to specify the name of a branch in the project specified by `project`. + Variable expansion is supported. GitLab will use a commit that is currently on the HEAD of the branch when creating a downstream pipeline. diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index f022012e2bc..e62779eb8f6 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1897,14 +1897,14 @@ This example creates three paths of execution: - For self-managed instances, the limit is: - Five by default (`ci_dag_limit_needs` feature flag is enabled). - 50 if the `ci_dag_limit_needs` feature flag is disabled. -- It is impossible for now to have `needs: []` (empty needs), - the job always needs to depend on something, unless this is the job - in the first stage (see [issue #65504](https://gitlab.com/gitlab-org/gitlab-foss/issues/65504)). +- It is impossible for now to have `needs: []` (empty needs), the job always needs to + depend on something, unless this is the job in the first stage. However, support for + an empty needs array [is planned](https://gitlab.com/gitlab-org/gitlab/issues/30631). - If `needs:` refers to a job that is marked as `parallel:`. the current job will depend on all parallel jobs created. -- `needs:` is similar to `dependencies:` in that it needs to use jobs from - prior stages, meaning it is impossible to create circular - dependencies or depend on jobs in the current stage (see [issue #65505](https://gitlab.com/gitlab-org/gitlab-foss/issues/65505)). +- `needs:` is similar to `dependencies:` in that it needs to use jobs from prior stages, + meaning it is impossible to create circular dependencies. Depending on jobs in the + current stage is not possible either, but support [is planned](https://gitlab.com/gitlab-org/gitlab/issues/30632). - Related to the above, stages must be explicitly defined for all jobs that have the keyword `needs:` or are referred to by one. |