Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
30cd8432
Commit
30cd8432
authored
Feb 13, 2019
by
Hiroyuki Sato
Committed by
Kamil Trzciński
Feb 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support `only: changes:` on MR pipelines
parent
a772e010
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
112 additions
and
10 deletions
+112
-10
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+10
-1
changelogs/unreleased/support-only-changes-on-mr-pipelines.yml
...elogs/unreleased/support-only-changes-on-mr-pipelines.yml
+5
-0
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+22
-4
lib/gitlab/ci/build/policy/changes.rb
lib/gitlab/ci/build/policy/changes.rb
+1
-1
spec/lib/gitlab/ci/build/policy/changes_spec.rb
spec/lib/gitlab/ci/build/policy/changes_spec.rb
+54
-2
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+20
-2
No files found.
app/models/ci/pipeline.rb
View file @
30cd8432
...
...
@@ -687,9 +687,18 @@ def branch_updated?
end
end
# Returns the modified paths.
#
# The returned value is
# * Array: List of modified paths that should be evaluated
# * nil: Modified path can not be evaluated
def
modified_paths
strong_memoize
(
:modified_paths
)
do
push_details
.
modified_paths
if
merge_request?
merge_request
.
modified_paths
elsif
branch_updated?
push_details
.
modified_paths
end
end
end
...
...
changelogs/unreleased/support-only-changes-on-mr-pipelines.yml
0 → 100644
View file @
30cd8432
---
title
:
'
Support
`only:
changes:`
on
MR
pipelines'
merge_request
:
24490
author
:
Hiroyuki Sato
type
:
added
doc/ci/yaml/README.md
View file @
30cd8432
...
...
@@ -423,10 +423,28 @@ connected with merge requests yet, and because GitLab is creating pipelines
before an user can create a merge request we don't know a target branch at
this point.
Without a target branch, it is not possible to know what the common ancestor is,
thus we always create a job in that case. This feature works best for stable
branches like
`master`
because in that case GitLab uses the previous commit
that is present in a branch to compare against the latest SHA that was pushed.
#### Using `changes` with `merge_requests`
With
[
pipelines for merge requests
](
../merge_request_pipelines/index.md
)
,
make it possible to define if a job should be created base on files modified
in a merge request.
For example:
```
docker build service one:
script: docker build -t my-service-one-image:$CI_COMMIT_REF_SLUG .
only:
refs:
- merge_requests
changes:
- Dockerfile
- service-one/**/*
```
In the scenario above, if you create or update a merge request that changes
either files in
`service-one`
folder or
`Dockerfile`
, GitLab creates and triggers
the
`docker build service one`
job.
## `tags`
...
...
lib/gitlab/ci/build/policy/changes.rb
View file @
30cd8432
...
...
@@ -10,7 +10,7 @@ def initialize(globs)
end
def
satisfied_by?
(
pipeline
,
seed
)
return
true
unless
pipeline
.
branch_updated
?
return
true
if
pipeline
.
modified_paths
.
nil
?
pipeline
.
modified_paths
.
any?
do
|
path
|
@globs
.
any?
do
|
glob
|
...
...
spec/lib/gitlab/ci/build/policy/changes_spec.rb
View file @
30cd8432
...
...
@@ -73,9 +73,9 @@
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
,
seed
)
end
context
'when
pipelines does not run for a branch update
'
do
context
'when
modified paths can not be evaluated
'
do
before
do
pipeline
.
before_sha
=
Gitlab
::
Git
::
BLANK_SHA
allow
(
pipeline
).
to
receive
(
:modified_paths
)
{
nil
}
end
it
'is always satisfied'
do
...
...
@@ -115,5 +115,57 @@
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
,
seed
)
end
end
context
'when branch is created'
do
let
(
:pipeline
)
do
create
(
:ci_empty_pipeline
,
project:
project
,
ref:
'feature'
,
source:
source
,
sha:
'0b4bc9a4'
,
before_sha:
Gitlab
::
Git
::
BLANK_SHA
,
merge_request:
merge_request
)
end
let
(
:ci_build
)
do
build
(
:ci_build
,
pipeline:
pipeline
,
project:
project
,
ref:
'feature'
)
end
let
(
:seed
)
{
double
(
'build seed'
,
to_resource:
ci_build
)
}
context
'when source is merge request'
do
let
(
:source
)
{
:merge_request
}
let
(
:merge_request
)
do
create
(
:merge_request
,
source_project:
project
,
source_branch:
'feature'
,
target_project:
project
,
target_branch:
'master'
)
end
it
'is satified by changes in the merge request'
do
policy
=
described_class
.
new
(
%w[files/ruby/feature.rb]
)
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
seed
)
end
it
'is not satified by changes not in the merge request'
do
policy
=
described_class
.
new
(
%w[foo.rb]
)
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
,
seed
)
end
end
context
'when source is push'
do
let
(
:source
)
{
:push
}
let
(
:merge_request
)
{
nil
}
it
'is always satified'
do
policy
=
described_class
.
new
(
%w[foo.rb]
)
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
seed
)
end
end
end
end
end
spec/models/ci/pipeline_spec.rb
View file @
30cd8432
...
...
@@ -1172,8 +1172,26 @@ def create_build(name, *traits, queued_at: current, started_from: 0, **opts)
pipeline
.
update_column
(
:before_sha
,
Gitlab
::
Git
::
BLANK_SHA
)
end
it
'raises an error'
do
expect
{
pipeline
.
modified_paths
}.
to
raise_error
(
ArgumentError
)
it
'returns nil'
do
expect
(
pipeline
.
modified_paths
).
to
be_nil
end
end
context
'when source is merge request'
do
let
(
:pipeline
)
do
create
(
:ci_pipeline
,
source: :merge_request
,
merge_request:
merge_request
)
end
let
(
:merge_request
)
do
create
(
:merge_request
,
source_project:
project
,
source_branch:
'feature'
,
target_project:
project
,
target_branch:
'master'
)
end
it
'returns merge request modified paths'
do
expect
(
pipeline
.
modified_paths
).
to
match
(
merge_request
.
modified_paths
)
end
end
end
...
...
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