Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'doc/ci/pipelines')
-rw-r--r--doc/ci/pipelines/cicd_minutes.md15
-rw-r--r--doc/ci/pipelines/downstream_pipelines.md16
-rw-r--r--doc/ci/pipelines/index.md4
-rw-r--r--doc/ci/pipelines/job_artifacts.md2
-rw-r--r--doc/ci/pipelines/merge_request_pipelines.md10
-rw-r--r--doc/ci/pipelines/settings.md5
6 files changed, 29 insertions, 23 deletions
diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
index d9ad224ab95..e69c510291d 100644
--- a/doc/ci/pipelines/cicd_minutes.md
+++ b/doc/ci/pipelines/cicd_minutes.md
@@ -216,9 +216,10 @@ The cost factors on self-managed instances are:
#### Cost factor for community contributions to GitLab projects
-Community contributors can use up to 300,000 minutes on shared runners when
-contributing to open source projects maintained by GitLab. The 300,000
-minutes applies to all SaaS tiers, and the cost factor calculation is:
+Community contributors can use up to 300,000 minutes on shared runners when contributing to open source projects
+maintained by GitLab. The maximum of 300,000 minutes would only be possible if contributing exclusively to projects [part of the GitLab product](https://about.gitlab.com/handbook/engineering/metrics/#projects-that-are-part-of-the-product). The total number of minutes available on shared runners
+is reduced by the CI/CD minutes used by pipelines from other projects.
+The 300,000 minutes applies to all SaaS tiers, and the cost factor calculation is:
- `Monthly minute quota / 300,000 job duration minutes = Cost factor`
@@ -255,9 +256,9 @@ calculations start again from `0`.
For example, if you have a monthly quota of `10,000` CI/CD minutes:
-- On **1st April**, you have `10,000` minutes.
+- On **April 1**, you have `10,000` minutes.
- During April, you use only `6,000` of the `10,000` minutes.
-- On **1st May**, the accumulated usage of minutes resets to `0`, and you have `10,000` minutes to use again
+- On **May 1**, the accumulated usage of minutes resets to `0`, and you have `10,000` minutes to use again
during May.
Usage data for the previous month is kept to show historical view of the consumption over time.
@@ -269,9 +270,9 @@ the next month.
For example:
-- On **1st April**, you purchase `5,000` additional CI/CD minutes.
+- On **April 1**, you purchase `5,000` additional CI/CD minutes.
- During April, you use only `3,000` of the `5,000` additional minutes.
-- On **1st May**, the unused minute roll over, so you have `2,000` additional minutes available for May.
+- On **May 1**, the unused minute roll over, so you have `2,000` additional minutes available for May.
Additional CI/CD minutes are a one-time purchase and do not renew or refresh each month.
diff --git a/doc/ci/pipelines/downstream_pipelines.md b/doc/ci/pipelines/downstream_pipelines.md
index 6c17c23552d..1ada4c4fac1 100644
--- a/doc/ci/pipelines/downstream_pipelines.md
+++ b/doc/ci/pipelines/downstream_pipelines.md
@@ -244,21 +244,25 @@ To trigger a child pipeline as a [merge request pipeline](merge_request_pipeline
```
1. Configure the child pipeline jobs to run in merge request pipelines with [`rules`](../yaml/index.md#rules)
- or [`workflow:rules`](../yaml/index.md#workflowrules). For example, with `rules`
- in a child pipeline's configuration file:
+ or [`workflow:rules`](../yaml/index.md#workflowrules).
+ For example, with `rules` in a child pipeline's configuration file:
```yaml
job1:
- script: ...
+ script: echo "Child pipeline job 1"
rules:
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_MERGE_REQUEST_ID
job2:
- script: ...
+ script: echo "Child pipeline job 2"
rules:
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_MERGE_REQUEST_ID
```
+ In child pipelines, `$CI_PIPELINE_SOURCE` always has a value of `parent_pipeline`
+ and cannot be used to identify merge request pipelines. Use `$CI_MERGE_REQUEST_ID`
+ instead, which is always present in merge request pipelines.
+
### Specify a branch for multi-project pipelines
You can specify the branch to use when triggering a multi-project pipeline. GitLab uses
diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
index ab98bab022e..324a2fa3ef9 100644
--- a/doc/ci/pipelines/index.md
+++ b/doc/ci/pipelines/index.md
@@ -75,7 +75,7 @@ You can also configure specific aspects of your pipelines through the GitLab UI.
- [Pipeline settings](settings.md) for each project.
- [Pipeline schedules](schedules.md).
-- [Custom CI/CD variables](../variables/index.md#custom-cicd-variables).
+- [Custom CI/CD variables](../variables/index.md#for-a-project).
### Ref specs for runners
@@ -156,7 +156,7 @@ The pipeline now executes the jobs as configured.
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/30101) in GitLab 13.7.
You can use the [`description` and `value`](../yaml/index.md#variablesdescription)
-keywords to define [pipeline-level (global) variables](../variables/index.md#create-a-custom-cicd-variable-in-the-gitlab-ciyml-file)
+keywords to [define pipeline-level (global) variables](../variables/index.md#define-a-cicd-variable-in-the-gitlab-ciyml-file)
that are prefilled when running a pipeline manually. Use the description to explain
information such as what the variable is used for, and what the acceptable values are.
diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md
index cc26ede5f6e..bd788cfd3eb 100644
--- a/doc/ci/pipelines/job_artifacts.md
+++ b/doc/ci/pipelines/job_artifacts.md
@@ -410,7 +410,7 @@ This message is often preceded by other errors or warnings that specify the file
generated. Check the job log for these messages.
If you find no helpful messages, retry the failed job after activating
-[CI/CD debug logging](../variables/index.md#debug-logging).
+[CI/CD debug logging](../variables/index.md#enable-debug-logging).
This logging should provide information to help you investigate further.
### Error message `Missing /usr/bin/gitlab-runner-helper. Uploading artifacts is disabled.`
diff --git a/doc/ci/pipelines/merge_request_pipelines.md b/doc/ci/pipelines/merge_request_pipelines.md
index 714e96d7954..7e18c11f234 100644
--- a/doc/ci/pipelines/merge_request_pipelines.md
+++ b/doc/ci/pipelines/merge_request_pipelines.md
@@ -20,20 +20,20 @@ Branch pipelines:
- Run when you push a new commit to a branch.
- Are the default type of pipeline.
- Have access to [some predefined variables](../variables/predefined_variables.md).
-- Have access to [protected variables](../variables/index.md#protected-cicd-variables) and [protected runners](../runners/configure_runners.md#prevent-runners-from-revealing-sensitive-information).
+- Have access to [protected variables](../variables/index.md#protect-a-cicd-variable) and [protected runners](../runners/configure_runners.md#prevent-runners-from-revealing-sensitive-information).
Merge request pipelines:
-- Run when you:
+- **Do not run by default**. The jobs in the CI/CD configuration file [must be configured](#prerequisites)
+ to run in merge request pipelines.
+- If configured, merge request pipelines run when you:
- Create a new merge request from a source branch with one or more commits.
- Push a new commit to the source branch for a merge request.
- Select **Run pipeline** from the **Pipelines** tab in a merge request. This option
is only available when merge request pipelines are configured for the pipeline
and the source branch has at least one commit.
-- Do not run by default. The jobs in the CI/CD configuration file [must be configured](#prerequisites)
- to run in merge request pipelines.
- Have access to [more predefined variables](#available-predefined-variables).
-- Do not have access to [protected variables](../variables/index.md#protected-cicd-variables) or [protected runners](../runners/configure_runners.md#prevent-runners-from-revealing-sensitive-information).
+- Do not have access to [protected variables](../variables/index.md#protect-a-cicd-variable) or [protected runners](../runners/configure_runners.md#prevent-runners-from-revealing-sensitive-information).
Both of these types of pipelines can appear on the **Pipelines** tab of a merge request.
diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md
index 423ee31dec4..cd696d816d7 100644
--- a/doc/ci/pipelines/settings.md
+++ b/doc/ci/pipelines/settings.md
@@ -32,7 +32,7 @@ To change the visibility of your pipelines and related features:
When it is selected, pipelines and related features are visible:
- For [**Public**](../../user/public_access.md) projects, to everyone.
- - For **Internal** projects, to all logged-in users except [external users](../../user/admin_area/external_users.md).
+ - For **Internal** projects, to all authenticated users except [external users](../../user/admin_area/external_users.md).
- For **Private** projects, to all project members (Guest or higher).
When it is cleared:
@@ -41,7 +41,7 @@ To change the visibility of your pipelines and related features:
and the **CI/CD** menu items are visible only to project members (Reporter or higher).
Other users, including guest users, can only view the status of pipelines and jobs, and only
when viewing merge requests or commits.
- - For **Internal** projects, pipelines are visible to all logged in users except [external users](../../user/admin_area/external_users.md).
+ - For **Internal** projects, pipelines are visible to all authenticated users except [external users](../../user/admin_area/external_users.md).
Related features are visible only to project members (Reporter or higher).
- For **Private** projects, pipelines and related features are visible to project members (Reporter or higher) only.
@@ -343,6 +343,7 @@ Depending on the status of your pipeline, a badge can have the following values:
- `passed`
- `failed`
- `skipped`
+- `manual`
- `canceled`
- `unknown`