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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
eae31540
Commit
eae31540
authored
Dec 13, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disallow circular dependency in cross pipeline creation
parent
f9bfec40
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
0 deletions
+22
-0
ee/app/services/ci/create_cross_project_pipeline_service.rb
ee/app/services/ci/create_cross_project_pipeline_service.rb
+4
-0
ee/spec/services/ci/create_cross_project_pipeline_service_spec.rb
...services/ci/create_cross_project_pipeline_service_spec.rb
+18
-0
No files found.
ee/app/services/ci/create_cross_project_pipeline_service.rb
View file @
eae31540
...
...
@@ -11,6 +11,10 @@ module Ci
return
bridge
.
drop!
(
:invalid_bridge_trigger
)
end
if
target_project
==
project
return
bridge
.
drop!
(
:invalid_bridge_trigger
)
end
unless
can_create_cross_pipeline?
return
bridge
.
drop!
(
:insufficient_bridge_permissions
)
end
...
...
ee/spec/services/ci/create_cross_project_pipeline_service_spec.rb
View file @
eae31540
...
...
@@ -121,5 +121,23 @@ describe Ci::CreateCrossProjectPipelineService, '#execute' do
expect
(
pipeline
.
ref
).
to
eq
'master'
end
end
context
'when circular dependency is defined'
do
let
(
:trigger
)
do
{
trigger:
{
project:
upstream_project
.
full_path
}
}
end
it
'does not create a new pipeline'
do
expect
{
service
.
execute
(
bridge
)
}
.
not_to
change
{
Ci
::
Pipeline
.
count
}
end
it
'changes status of the bridge build'
do
service
.
execute
(
bridge
)
expect
(
bridge
.
reload
).
to
be_failed
expect
(
bridge
.
failure_reason
).
to
eq
'invalid_bridge_trigger'
end
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