From 00a8c64ffd18e74df4b1cdeda7776b5221fddafe Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 15 Apr 2020 06:09:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/ci/docker/using_docker_build.md | 7 ++++++- doc/ci/yaml/README.md | 13 +++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'doc/ci') diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index acdc61d008f..0ae7a10a290 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -147,7 +147,12 @@ released. #### TLS enabled NOTE: **Note** -This requires GitLab Runner 11.11 or higher. +Requires GitLab Runner 11.11 or later, but is not supported if GitLab +Runner is installed using the [Helm +chart](https://docs.gitlab.com/runner/install/kubernetes.html). See the +[related +issue](https://gitlab.com/gitlab-org/charts/gitlab-runner/issues/83) for +details. The Docker daemon supports connection over TLS and it's done by default for Docker 19.03.8 or higher. This is the **suggested** way to use the diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index e5d619ea00c..e79d44cb057 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1264,7 +1264,9 @@ osx job: `allow_failure` allows a job to fail without impacting the rest of the CI suite. -The default value is `false`, except for [manual](#whenmanual) jobs. +The default value is `false`, except for [manual](#whenmanual) jobs using the +`when: manual` syntax, unless using [`rules:`](#rules) syntax, where all jobs +default to false, *including* `when: manual` jobs. When enabled and the job fails, the job will show an orange warning in the UI. However, the logical flow of the pipeline will consider the job a @@ -1379,14 +1381,17 @@ manual action by clicking a _play_ button. When a pipeline is blocked, it will not be merged if Merge When Pipeline Succeeds is set. Blocked pipelines also do have a special status, called _manual_. -Manual actions are non-blocking by default. If you want to make manual action -blocking, it is necessary to add `allow_failure: false` to the job's definition -in `.gitlab-ci.yml`. +When the `when:manual` syntax is used, manual actions are non-blocking by +default. If you want to make manual action blocking, it is necessary to add +`allow_failure: false` to the job's definition in `.gitlab-ci.yml`. Optional manual actions have `allow_failure: true` set by default and their Statuses do not contribute to the overall pipeline status. So, if a manual action fails, the pipeline will eventually succeed. +NOTE: **Note:** +When using [`rules:`](#rules), `allow_failure` defaults to `false`, including for manual jobs. + Manual actions are considered to be write actions, so permissions for [protected branches](../../user/project/protected_branches.md) are used when a user wants to trigger an action. In other words, in order to trigger a manual -- cgit v1.2.1