diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 18:08:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 18:08:03 +0300 |
commit | 59469a17821eda8a34d08b1e46584e902d1e963a (patch) | |
tree | 504eb7237ea7cadb589e0791fa243f7bf93237a7 /doc/ci/jobs | |
parent | e2b92514e3def8074c0855100632ebb9935d2a19 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/jobs')
-rw-r--r-- | doc/ci/jobs/index.md | 4 | ||||
-rw-r--r-- | doc/ci/jobs/job_control.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/jobs/index.md b/doc/ci/jobs/index.md index 09c5463d165..3ff3c0c10e9 100644 --- a/doc/ci/jobs/index.md +++ b/doc/ci/jobs/index.md @@ -157,9 +157,9 @@ additional variables. To access this page, click on the **name** of the manual j the pipeline view, *not* the play (**{play}**) button. This is useful when you want to alter the execution of a job that uses -[custom CI/CD variables](../variables/README.md#custom-cicd-variables). +[custom CI/CD variables](../variables/index.md#custom-cicd-variables). Add a variable name (key) and value here to override the value defined in -[the UI or `.gitlab-ci.yml`](../variables/README.md#custom-cicd-variables), +[the UI or `.gitlab-ci.yml`](../variables/index.md#custom-cicd-variables), for a single run of the manual job. ![Manual job variables](img/manual_job_variables_v13_10.png) diff --git a/doc/ci/jobs/job_control.md b/doc/ci/jobs/job_control.md index 1ca1bce979d..cb5483e97a4 100644 --- a/doc/ci/jobs/job_control.md +++ b/doc/ci/jobs/job_control.md @@ -263,7 +263,7 @@ Other commonly used variables for `if` clauses: branch. Use when you want to have the same configuration in multiple projects with different default branches. - `if: '$CI_COMMIT_BRANCH =~ /regex-expression/'`: If the commit branch matches a regular expression. -- `if: '$CUSTOM_VARIABLE !~ /regex-expression/'`: If the [custom variable](../variables/README.md#custom-cicd-variables) +- `if: '$CUSTOM_VARIABLE !~ /regex-expression/'`: If the [custom variable](../variables/index.md#custom-cicd-variables) `CUSTOM_VARIABLE` does **not** match a regular expression. - `if: '$CUSTOM_VARIABLE == "value1"'`: If the custom variable `CUSTOM_VARIABLE` is exactly `value1`. |