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
51ff860f
Commit
51ff860f
authored
Jul 29, 2021
by
Marcel Amirault
Committed by
Fabio Pitino
Jul 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move skip ci to be earlier in the pipeline processing
parent
ef7b242c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
135 additions
and
30 deletions
+135
-30
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+2
-1
config/feature_flags/development/ci_skip_before_parsing_yaml.yml
...feature_flags/development/ci_skip_before_parsing_yaml.yml
+8
-0
lib/gitlab/ci/pipeline/chain/legacy_skip.rb
lib/gitlab/ci/pipeline/chain/legacy_skip.rb
+56
-0
lib/gitlab/ci/pipeline/chain/skip.rb
lib/gitlab/ci/pipeline/chain/skip.rb
+8
-4
spec/services/ci/create_pipeline_service_spec.rb
spec/services/ci/create_pipeline_service_spec.rb
+61
-25
No files found.
app/services/ci/create_pipeline_service.rb
View file @
51ff860f
...
...
@@ -11,11 +11,12 @@ module Ci
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Validate
::
Abilities
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Validate
::
Repository
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Validate
::
SecurityOrchestrationPolicy
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Skip
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Config
::
Content
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Config
::
Process
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Validate
::
AfterConfig
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
RemoveUnwantedChatJobs
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Skip
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Legacy
Skip
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
SeedBlock
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
EvaluateWorkflowRules
,
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Seed
,
...
...
config/feature_flags/development/ci_skip_before_parsing_yaml.yml
0 → 100644
View file @
51ff860f
---
name
:
ci_skip_before_parsing_yaml
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66147
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/337167
milestone
:
'
14.2'
type
:
development
group
:
group::pipeline execution
default_enabled
:
false
lib/gitlab/ci/pipeline/chain/legacy_skip.rb
0 → 100644
View file @
51ff860f
# frozen_string_literal: true
module
Gitlab
module
Ci
module
Pipeline
module
Chain
# This will be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/337167
class
LegacySkip
<
Chain
::
Skip
include
::
Gitlab
::
Utils
::
StrongMemoize
SKIP_PATTERN
=
/\[(ci[ _-]skip|skip[ _-]ci)\]/i
.
freeze
def
perform!
return
if
::
Feature
.
enabled?
(
:ci_skip_before_parsing_yaml
,
project
,
default_enabled: :yaml
)
if
skipped?
if
@command
.
save_incompleted
# Project iid must be called outside a transaction, so we ensure it is set here
# otherwise it may be set within the state transition transaction of the skip call
# which it will lock the InternalId row for the whole transaction
@pipeline
.
ensure_project_iid!
@pipeline
.
skip
end
end
end
def
break?
return
if
::
Feature
.
enabled?
(
:ci_skip_before_parsing_yaml
,
project
,
default_enabled: :yaml
)
skipped?
end
private
def
skipped?
!
@command
.
ignore_skip_ci
&&
(
commit_message_skips_ci?
||
push_option_skips_ci?
)
end
def
commit_message_skips_ci?
return
false
unless
@pipeline
.
git_commit_message
strong_memoize
(
:commit_message_skips_ci
)
do
!!
(
@pipeline
.
git_commit_message
=~
SKIP_PATTERN
)
end
end
def
push_option_skips_ci?
@command
.
push_options
.
present?
&&
@command
.
push_options
.
deep_symbolize_keys
.
dig
(
:ci
,
:skip
).
present?
end
end
end
end
end
end
lib/gitlab/ci/pipeline/chain/skip.rb
View file @
51ff860f
...
...
@@ -10,6 +10,8 @@ module Gitlab
SKIP_PATTERN
=
/\[(ci[ _-]skip|skip[ _-]ci)\]/i
.
freeze
def
perform!
return
unless
::
Feature
.
enabled?
(
:ci_skip_before_parsing_yaml
,
project
,
default_enabled: :yaml
)
if
skipped?
if
@command
.
save_incompleted
# Project iid must be called outside a transaction, so we ensure it is set here
...
...
@@ -22,16 +24,18 @@ module Gitlab
end
end
def
skipped?
!
@command
.
ignore_skip_ci
&&
(
commit_message_skips_ci?
||
push_option_skips_ci?
)
end
def
break?
return
unless
::
Feature
.
enabled?
(
:ci_skip_before_parsing_yaml
,
project
,
default_enabled: :yaml
)
skipped?
end
private
def
skipped?
!
@command
.
ignore_skip_ci
&&
(
commit_message_skips_ci?
||
push_option_skips_ci?
)
end
def
commit_message_skips_ci?
return
false
unless
@pipeline
.
git_commit_message
...
...
spec/services/ci/create_pipeline_service_spec.rb
View file @
51ff860f
...
...
@@ -19,7 +19,6 @@ RSpec.describe Ci::CreatePipelineService do
def
execute_service
(
source: :push
,
after:
project
.
commit
.
id
,
message:
'Message'
,
ref:
ref_name
,
trigger_request:
nil
,
variables_attributes:
nil
,
...
...
@@ -32,7 +31,6 @@ RSpec.describe Ci::CreatePipelineService do
params
=
{
ref:
ref
,
before:
'00000000'
,
after:
after
,
commits:
[{
message:
message
}],
variables_attributes:
variables_attributes
,
push_options:
push_options
,
source_sha:
source_sha
,
...
...
@@ -508,7 +506,7 @@ RSpec.describe Ci::CreatePipelineService do
it
'creates failed pipeline'
do
stub_ci_pipeline_yaml_file
(
ci_yaml
)
pipeline
=
execute_service
(
message:
message
)
.
payload
pipeline
=
execute_service
.
payload
expect
(
pipeline
).
to
be_persisted
expect
(
pipeline
.
builds
.
any?
).
to
be
false
...
...
@@ -671,9 +669,30 @@ RSpec.describe Ci::CreatePipelineService do
end
context
'when commit contains a [ci skip] directive'
do
let
(
:message
)
{
"some message[ci skip]"
}
shared_examples
'creating a pipeline'
do
it
'does not skip pipeline creation'
do
pipeline
=
execute_service
.
payload
expect
(
pipeline
).
to
be_persisted
expect
(
pipeline
.
builds
.
first
.
name
).
to
eq
(
"rspec"
)
end
end
shared_examples
'skipping a pipeline'
do
it
'skips pipeline creation'
do
pipeline
=
execute_service
.
payload
ci_messages
=
[
expect
(
pipeline
).
to
be_persisted
expect
(
pipeline
.
builds
.
any?
).
to
be
false
expect
(
pipeline
.
status
).
to
eq
(
"skipped"
)
end
end
before
do
allow_any_instance_of
(
Ci
::
Pipeline
).
to
receive
(
:git_commit_message
)
{
commit_message
}
end
skip_commit_messages
=
[
"some message[ci skip]"
,
"some message[skip ci]"
,
"some message[CI SKIP]"
,
...
...
@@ -684,28 +703,19 @@ RSpec.describe Ci::CreatePipelineService do
"some message[skip-ci]"
]
before
do
allow_any_instance_of
(
Ci
::
Pipeline
).
to
receive
(
:git_commit_message
)
{
message
}
end
skip_commit_messages
.
each
do
|
skip_commit_message
|
context
"when the commit message is
#{
skip_commit_message
}
"
do
let
(
:commit_message
)
{
skip_commit_message
}
ci_messages
.
each
do
|
ci_message
|
it
"skips builds creation if the commit message is
#{
ci_message
}
"
do
pipeline
=
execute_service
(
message:
ci_message
).
payload
it_behaves_like
'skipping a pipeline'
expect
(
pipeline
).
to
be_persisted
expect
(
pipeline
.
builds
.
any?
).
to
be
false
expect
(
pipeline
.
status
).
to
eq
(
"skipped"
)
end
end
shared_examples
'creating a pipeline'
do
it
'does not skip pipeline creation'
do
allow_any_instance_of
(
Ci
::
Pipeline
).
to
receive
(
:git_commit_message
)
{
commit_message
}
pipeline
=
execute_service
(
message:
commit_message
).
payload
context
'when the FF ci_skip_before_parsing_yaml is disabled'
do
before
do
stub_feature_flags
(
ci_skip_before_parsing_yaml:
false
)
end
expect
(
pipeline
).
to
be_persisted
e
xpect
(
pipeline
.
builds
.
first
.
name
).
to
eq
(
"rspec"
)
it_behaves_like
'skipping a pipeline'
e
nd
end
end
...
...
@@ -713,6 +723,14 @@ RSpec.describe Ci::CreatePipelineService do
let
(
:commit_message
)
{
'some message'
}
it_behaves_like
'creating a pipeline'
context
'when the FF ci_skip_before_parsing_yaml is disabled'
do
before
do
stub_feature_flags
(
ci_skip_before_parsing_yaml:
false
)
end
it_behaves_like
'creating a pipeline'
end
end
context
'when commit message is nil'
do
...
...
@@ -722,9 +740,27 @@ RSpec.describe Ci::CreatePipelineService do
end
context
'when there is [ci skip] tag in commit message and yaml is invalid'
do
let
(
:commit_message
)
{
'some message [ci skip]'
}
let
(
:ci_yaml
)
{
'invalid: file: fiile'
}
it_behaves_like
'a failed pipeline'
before
do
stub_ci_pipeline_yaml_file
(
ci_yaml
)
end
it_behaves_like
'skipping a pipeline'
context
'when the FF ci_skip_before_parsing_yaml is disabled'
do
before
do
stub_feature_flags
(
ci_skip_before_parsing_yaml:
false
)
end
it
'creates the pipeline with error'
do
pipeline
=
execute_service
.
payload
expect
(
pipeline
).
to
be_persisted
expect
(
pipeline
.
status
).
to
eq
(
"failed"
)
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