Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
4b2875a0
Commit
4b2875a0
authored
Dec 07, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Documentation for merge request pipelines
This is a documentation change about #15310.
parent
ec2c268b
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
201 additions
and
76 deletions
+201
-76
doc/ci/README.md
doc/ci/README.md
+1
-0
doc/ci/merge_request_pipelines/img/merge_request.png
doc/ci/merge_request_pipelines/img/merge_request.png
+0
-0
doc/ci/merge_request_pipelines/img/pipeline_detail.png
doc/ci/merge_request_pipelines/img/pipeline_detail.png
+0
-0
doc/ci/merge_request_pipelines/index.md
doc/ci/merge_request_pipelines/index.md
+84
-0
doc/ci/variables/README.md
doc/ci/variables/README.md
+78
-67
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+28
-9
doc/user/project/merge_requests/index.md
doc/user/project/merge_requests/index.md
+10
-0
No files found.
doc/ci/README.md
View file @
4b2875a0
...
...
@@ -71,6 +71,7 @@ learn how to leverage its potential even more.
-
[
Caching dependencies
](
caching/index.md
)
-
[
Git submodules
](
git_submodules.md
)
- How to run your CI jobs when Git
submodules are involved
-
[
Pipelines for merge requests
](
merge_request_pipelines/index.md
)
-
[
Use SSH keys in your build environment
](
ssh_keys/README.md
)
-
[
Trigger pipelines through the GitLab API
](
triggers/README.md
)
-
[
Trigger pipelines on a schedule
](
../user/project/pipelines/schedules.md
)
...
...
doc/ci/merge_request_pipelines/img/merge_request.png
0 → 100644
View file @
4b2875a0
56.2 KB
doc/ci/merge_request_pipelines/img/pipeline_detail.png
0 → 100644
View file @
4b2875a0
41.6 KB
doc/ci/merge_request_pipelines/index.md
0 → 100644
View file @
4b2875a0
# Pipelines for merge requests
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/15310) in GitLab 11.6
Usually, when a developer creates a new merge request, a pipeline runs on the
new change and checks if it's qualified to be merged into a target branch. This
pipeline should contain only necessary jobs for checking the new changes.
For example, unit tests, lint checks, and Review Apps are often used in this cycle.
With pipelines for merge requests, you can design a specific pipeline structure
for merge requests. All you need to do is just adding
`only: [merge_requests]`
to
the jobs that you want it to run for only merge requests.
Every time, when developers create or update merge requests, a pipeline runs on
their new commits at every push to GitLab.
NOTE:
**Note**
:
If you use both this feature and the
[
Merge When Pipeline Succeeds
](
../../user/project/merge_requests/merge_when_pipeline_succeeds.md
)
feature, pipelines for merge requests take precendence over the other regular pipelines.
For example, consider a GitLab CI/CD configuration in .gitlab-ci.yml as follows:
```
yaml
build
:
stage
:
build
script
:
./build
only
:
-
branches
-
tags
-
merge_requests
test
:
stage
:
test
script
:
./test
only
:
-
merge_requests
deploy
:
stage
:
deploy
script
:
./deploy
```
After a developer updated code in a merge request with whatever methods (e.g.
`git push`
),
GitLab detects that the code is updated and create a new pipeline for the merge request.
The pipeline fetches the latest code from the source branch and run tests against it.
In this example, the pipeline contains only
`build`
and
`test`
jobs.
Since
`deploy`
job does not have the
`only: [merge_requests]`
rule,
deployment jobs will not happen in the merge request.
Consider this pipeline list viewed from the
**Pipelines**
tab in a merge request:
![
Merge request page
](
img/merge_request.png
)
Note that pipelines tagged as
**merge request**
indicate that they were triggered
when a merge request was created or updated.
The same tag is shown on the pipeline's details:
![
Pipeline's details
](
img/pipeline_detail.png
)
## Important notes about merge requests from forked projects
Note that the current behavior is subject to change. In the usual contribution
flow, external contributors follow the following steps:
1.
Fork a parent project.
1.
Create a merge request from the forked project that targets the
`master`
branch
in the parent project.
1.
A pipeline runs on the merge request.
1.
A mainatiner from the parent project checks the pipeline result, and merge
into a target branch if the latest pipeline has passed.
Currently, those pipelines are created in a
**forked**
project, not in the
parent project. This means you cannot completely trust the pipeline result,
because, technically, external contributors can disguise their pipeline results
by tweaking their GitLab Runner in the forked project.
There are multiple reasons about why GitLab doesn't allow those pipelines to be
created in the parent project, but one of the biggest reasons is security.
External users could steal secret variables from the parent project by modifying
.gitlab-ci.yml.
We're discussing a secure solution about how to run pipelines for merge requests
that submitted from forked projects,
see
[
the issue about the permission extension
](
https://gitlab.com/gitlab-org/gitlab-ce/issues/23902
)
.
doc/ci/variables/README.md
View file @
4b2875a0
This diff is collapsed.
Click to expand it.
doc/ci/yaml/README.md
View file @
4b2875a0
...
...
@@ -342,15 +342,16 @@ In addition, `only` and `except` allow the use of special keywords:
|
**Value**
|
**Description**
|
| --------- | ---------------- |
|
`branches`
| When a branch is pushed. |
|
`tags`
| When a tag is pushed. |
|
`api`
| When pipeline has been triggered by a second pipelines API (not triggers API). |
|
`external`
| When using CI services other than GitLab. |
|
`pipelines`
| For multi-project triggers, created using the API with
`CI_JOB_TOKEN`
. |
|
`pushes`
| Pipeline is triggered by a
`git push`
by the user. |
|
`schedules`
| For
[
scheduled pipelines
][
schedules
]
. |
|
`triggers`
| For pipelines created using a trigger token. |
|
`web`
| For pipelines created using
**Run pipeline**
button in GitLab UI (under your project's
**Pipelines**
). |
|
`branches`
| When a git reference of a pipeline is a branch. |
|
`tags`
| When a git reference of a pipeline is a tag. |
|
`api`
| When pipeline has been triggered by a second pipelines API (not triggers API). |
|
`external`
| When using CI services other than GitLab. |
|
`pipelines`
| For multi-project triggers, created using the API with
`CI_JOB_TOKEN`
. |
|
`pushes`
| Pipeline is triggered by a
`git push`
by the user. |
|
`schedules`
| For
[
scheduled pipelines
][
schedules
]
. |
|
`triggers`
| For pipelines created using a trigger token. |
|
`web`
| For pipelines created using
**Run pipeline**
button in GitLab UI (under your project's
**Pipelines**
). |
|
`merge_requests`
| When a merge request is created or updated (See
[
pipelines for merge requests
](
../merge_request_pipelines/index.md
)
). |
In the example below,
`job`
will run only for refs that start with
`issue-`
,
whereas all branches will be skipped:
...
...
@@ -391,6 +392,24 @@ job:
The above example will run
`job`
for all branches on
`gitlab-org/gitlab-ce`
,
except master.
If a job does not have neither
`only`
nor
`except`
rule,
`only: ['branches', 'tags']`
is set by default.
For example,
```
yaml
job
:
script
:
echo 'test'
```
is translated to
```
yaml
job
:
script
:
echo 'test'
only
:
[
'
branches'
,
'
tags'
]
```
## `only` and `except` (complex)
> `refs` and `kubernetes` policies introduced in GitLab 10.0
...
...
doc/user/project/merge_requests/index.md
View file @
4b2875a0
...
...
@@ -259,6 +259,16 @@ all your changes will be available to preview by anyone with the Review Apps lin
[
Read more about Review Apps.
](
../../../ci/review_apps/index.md
)
## Customize a specific pipeline structure for merge requests
When a developer updates a merge request, a pipeline should quickly report back
its result to the developer, but often pipelines take long time to complete
because general branch pipelines contain unrelated jobs to the merge request.
You can customize a specific pipeline structure for merge requests in order to
speed the cycle up by running only important jobs.
[
Learn more about pipelines for merge requests.
](
../../../ci/merge_request_pipelines/index.md
)
## Pipeline status in merge requests
If you've set up
[
GitLab CI/CD
](
../../../ci/README.md
)
in your project,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment