diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 15:38:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 15:38:12 +0300 |
| commit | e2b92514e3def8074c0855100632ebb9935d2a19 (patch) | |
| tree | 5ddea5ed33370749e6b782dece20dc18d6a327d5 /doc/ci/jobs | |
| parent | 79659fe1fe45f2bdd13cd1a3980fbf1714caad57 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/jobs')
| -rw-r--r-- | doc/ci/jobs/index.md | 2 | ||||
| -rw-r--r-- | doc/ci/jobs/job_control.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/jobs/index.md b/doc/ci/jobs/index.md index f359eecf01b..09c5463d165 100644 --- a/doc/ci/jobs/index.md +++ b/doc/ci/jobs/index.md @@ -29,7 +29,7 @@ jobs, where each of the jobs executes a different command. Of course a command can execute code directly (`./configure;make;make install`) or run a script (`test.sh`) in the repository. -Jobs are picked up by [runners](../runners/README.md) and executed in the +Jobs are picked up by [runners](../runners/index.md) and executed in the environment of the runner. What is important is that each job is run independently from each other. diff --git a/doc/ci/jobs/job_control.md b/doc/ci/jobs/job_control.md index 27eda577b46..1ca1bce979d 100644 --- a/doc/ci/jobs/job_control.md +++ b/doc/ci/jobs/job_control.md @@ -225,7 +225,7 @@ check the value of the `$CI_PIPELINE_SOURCE` variable: | `pipeline` | For [multi-project pipelines](../multi_project_pipelines.md) created by [using the API with `CI_JOB_TOKEN`](../multi_project_pipelines.md#create-multi-project-pipelines-by-using-the-api), or the [`trigger`](../yaml/README.md#trigger) keyword. | | `push` | For pipelines triggered by a `git push` event, including for branches and tags. | | `schedule` | For [scheduled pipelines](../pipelines/schedules.md). | -| `trigger` | For pipelines created by using a [trigger token](../triggers/README.md#trigger-token). | +| `trigger` | For pipelines created by using a [trigger token](../triggers/index.md#trigger-token). | | `web` | For pipelines created by using **Run pipeline** button in the GitLab UI, from the project's **CI/CD > Pipelines** section. | | `webide` | For pipelines created by using the [WebIDE](../../user/project/web_ide/index.md). | @@ -306,7 +306,7 @@ to control when to add jobs to pipelines. In the following example, `job` runs only for: - Git tags -- [Triggers](../triggers/README.md#trigger-token) +- [Triggers](../triggers/index.md#trigger-token) - [Scheduled pipelines](../pipelines/schedules.md) ```yaml |