diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 09:07:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 09:07:59 +0300 |
commit | 7421e6f9f2b5889b05738af7eba568af6ae3fcbc (patch) | |
tree | 0c7f9656565ae4ef09611345248ea518c4deb5b8 /doc/ci/variables | |
parent | bf32dbaad2b059a3bf3e880c08cb0a026effc158 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/variables')
-rw-r--r-- | doc/ci/variables/README.md | 18 | ||||
-rw-r--r-- | doc/ci/variables/predefined_variables.md | 10 |
2 files changed, 6 insertions, 22 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index af41d1ab958..831669b6f6b 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -221,7 +221,7 @@ All variables are set as environment variables in the build environment, and they are accessible with normal methods that are used to access such variables. In most cases `bash` or `sh` is used to execute the job script. -To access environment variables, use the syntax for your Runner's [shell][shellexecutors]. +To access environment variables, use the syntax for your Runner's [shell](https://docs.gitlab.com/runner/executors/). | Shell | Usage | |----------------------|-----------------| @@ -415,7 +415,7 @@ Click [here](where_variables_can_be_used.md) for a section that describes where Variables can be protected. Whenever a variable is protected, it would only be securely passed to pipelines running on the -[protected branches] or [protected tags]. The other pipelines would not get any +[protected branches](../../user/project/protected_branches.md) or [protected tags](../../user/project/protected_tags.md). The other pipelines would not get any protected variables. Protected variables can be added by going to your project's @@ -427,7 +427,7 @@ Once you set them, they will be available for all subsequent pipelines. ### Limiting environment scopes of environment variables You can limit the environment scope of a variable by -[defining which environments][envs] it can be available for. +[defining which environments](../environments.md) it can be available for. To learn more about about scoping environments, see [Scoping environments with specs](../environments.md#scoping-environments-with-specs). @@ -802,15 +802,3 @@ if [[ -d "/builds/gitlab-examples/ci-debug-trace/.git" ]]; then ... ``` - -[ce-13784]: https://gitlab.com/gitlab-org/gitlab-foss/issues/13784 "Simple protection of CI variables" -[envs]: ../environments.md -[protected branches]: ../../user/project/protected_branches.md -[protected tags]: ../../user/project/protected_tags.md -[shellexecutors]: https://docs.gitlab.com/runner/executors/ -[triggered]: ../triggers/README.md -[trigger-job-token]: ../triggers/README.md#ci-job-token -[gitlab-deploy-token]: ../../user/project/deploy_tokens/index.md#gitlab-deploy-token -[registry]: ../../user/project/container_registry.md -[dependent-repositories]: ../../user/project/new_ci_build_permissions_model.md#dependent-repositories -[get-job-artifacts]: ../../api/jobs.html#get-job-artifacts diff --git a/doc/ci/variables/predefined_variables.md b/doc/ci/variables/predefined_variables.md index 0fab965a0c0..835699359bf 100644 --- a/doc/ci/variables/predefined_variables.md +++ b/doc/ci/variables/predefined_variables.md @@ -45,8 +45,8 @@ future GitLab releases.** | `CI_CONFIG_PATH` | 9.4 | 0.5 | The path to CI config file. Defaults to `.gitlab-ci.yml` | | `CI_DEBUG_TRACE` | all | 1.7 | Whether [debug logging (tracing)](README.md#debug-logging) is enabled | | `CI_DEFAULT_BRANCH` | 12.4 | all | The name of the default branch for the project. | -| `CI_DEPLOY_PASSWORD` | 10.8 | all | Authentication password of the [GitLab Deploy Token][gitlab-deploy-token], only present if the Project has one related. | -| `CI_DEPLOY_USER` | 10.8 | all | Authentication username of the [GitLab Deploy Token][gitlab-deploy-token], only present if the Project has one related. | +| `CI_DEPLOY_PASSWORD` | 10.8 | all | Authentication password of the [GitLab Deploy Token](../../user/project/deploy_tokens/index.md#gitlab-deploy-token), only present if the Project has one related. | +| `CI_DEPLOY_USER` | 10.8 | all | Authentication username of the [GitLab Deploy Token](../../user/project/deploy_tokens/index.md#gitlab-deploy-token), only present if the Project has one related. | | `CI_DISPOSABLE_ENVIRONMENT` | all | 10.1 | Marks that the job is executed in a disposable environment (something that is created only for this job and disposed of/destroyed after the execution - all executors except `shell` and `ssh`). If the environment is disposable, it is set to true, otherwise it is not defined at all. | | `CI_ENVIRONMENT_NAME` | 8.15 | all | The name of the environment for this job. Only present if [`environment:name`](../yaml/README.md#environmentname) is set. | | `CI_ENVIRONMENT_SLUG` | 8.15 | all | A simplified version of the environment name, suitable for inclusion in DNS, URLs, Kubernetes labels, etc. Only present if [`environment:name`](../yaml/README.md#environmentname) is set. | @@ -61,7 +61,7 @@ future GitLab releases.** | `CI_JOB_MANUAL` | 8.12 | all | The flag to indicate that job was manually started | | `CI_JOB_NAME` | 9.0 | 0.5 | The name of the job as defined in `.gitlab-ci.yml` | | `CI_JOB_STAGE` | 9.0 | 0.5 | The name of the stage as defined in `.gitlab-ci.yml` | -| `CI_JOB_TOKEN` | 9.0 | 1.2 | Token used for authenticating with the [GitLab Container Registry][registry] and downloading [dependent repositories][dependent-repositories] | +| `CI_JOB_TOKEN` | 9.0 | 1.2 | Token used for authenticating with the [GitLab Container Registry](../../user/packages/container_registry/index.md) and downloading [dependent repositories](../../user/project/new_ci_build_permissions_model.md#dependent-repositories) | | `CI_JOB_URL` | 11.1 | 0.5 | Job details URL | | `CI_MERGE_REQUEST_ASSIGNEES` | 11.9 | all | Comma-separated list of username(s) of assignee(s) for the merge request if [the pipelines are for merge requests](../merge_request_pipelines/index.md). Available only if `only: [merge_requests]` or [`rules`](../yaml/README.md#rules) syntax is used and the merge request is created. | | `CI_MERGE_REQUEST_CHANGED_PAGE_PATHS` | 12.9 | all | Comma-separated list of paths of changed pages in a deployed [Review App](../review_apps/index.md) for a [Merge Request](../merge_request_pipelines/index.md). A [Route Map](../review_apps/index.md#route-maps) must be configured. | @@ -134,7 +134,3 @@ future GitLab releases.** | `GITLAB_USER_LOGIN` | 10.0 | all | The login username of the user who started the job | | `GITLAB_USER_NAME` | 10.0 | all | The real name of the user who started the job | | `RESTORE_CACHE_ATTEMPTS` | 8.15 | 1.9 | Number of attempts to restore the cache running a job | - -[gitlab-deploy-token]: ../../user/project/deploy_tokens/index.md#gitlab-deploy-token -[registry]: ../../user/packages/container_registry/index.md -[dependent-repositories]: ../../user/project/new_ci_build_permissions_model.md#dependent-repositories |