Commit 8db63b26 authored by Filip Krakowski's avatar Filip Krakowski Committed by Shinya Maeda

Use pipeline.source to determine what triggered a pipeline

parent fe9b78d6
...@@ -411,7 +411,7 @@ job: ...@@ -411,7 +411,7 @@ job:
``` ```
In this example, `job` will run only for refs that are tagged, or if a build is In this example, `job` will run only for refs that are tagged, or if a build is
explicitly requested via an API trigger or a Pipeline Schedule. explicitly requested via an API trigger or a [Pipeline Schedule](../../user/project/pipelines/schedules.md).
```yaml ```yaml
job: job:
......
...@@ -20,26 +20,26 @@ module Ci ...@@ -20,26 +20,26 @@ module Ci
raise ValidationError, e.message raise ValidationError, e.message
end end
def jobs_for_ref(ref, tag = false, trigger_request = nil, pipeline_schedule = nil) def jobs_for_ref(ref, tag = false, source = nil)
@jobs.select do |_, job| @jobs.select do |_, job|
process?(job[:only], job[:except], ref, tag, trigger_request, pipeline_schedule) process?(job[:only], job[:except], ref, tag, source)
end end
end end
def jobs_for_stage_and_ref(stage, ref, tag = false, trigger_request = nil, pipeline_schedule = nil) def jobs_for_stage_and_ref(stage, ref, tag = false, source = nil)
jobs_for_ref(ref, tag, trigger_request, pipeline_schedule).select do |_, job| jobs_for_ref(ref, tag, source).select do |_, job|
job[:stage] == stage job[:stage] == stage
end end
end end
def builds_for_ref(ref, tag = false, trigger_request = nil, pipeline_schedule = nil) def builds_for_ref(ref, tag = false, source = nil)
jobs_for_ref(ref, tag, trigger_request, pipeline_schedule).map do |name, _| jobs_for_ref(ref, tag, source).map do |name, _|
build_attributes(name) build_attributes(name)
end end
end end
def builds_for_stage_and_ref(stage, ref, tag = false, trigger_request = nil, pipeline_schedule = nil) def builds_for_stage_and_ref(stage, ref, tag = false, source = nil)
jobs_for_stage_and_ref(stage, ref, tag, trigger_request, pipeline_schedule).map do |name, _| jobs_for_stage_and_ref(stage, ref, tag, source).map do |name, _|
build_attributes(name) build_attributes(name)
end end
end end
...@@ -193,31 +193,31 @@ module Ci ...@@ -193,31 +193,31 @@ module Ci
end end
end end
def process?(only_params, except_params, ref, tag, trigger_request, pipeline_schedule) def process?(only_params, except_params, ref, tag, source)
if only_params.present? if only_params.present?
return false unless matching?(only_params, ref, tag, trigger_request, pipeline_schedule) return false unless matching?(only_params, ref, tag, source)
end end
if except_params.present? if except_params.present?
return false if matching?(except_params, ref, tag, trigger_request, pipeline_schedule) return false if matching?(except_params, ref, tag, source)
end end
true true
end end
def matching?(patterns, ref, tag, trigger_request, pipeline_schedule) def matching?(patterns, ref, tag, source)
patterns.any? do |pattern| patterns.any? do |pattern|
match_ref?(pattern, ref, tag, trigger_request, pipeline_schedule) match_ref?(pattern, ref, tag, source)
end end
end end
def match_ref?(pattern, ref, tag, trigger_request, pipeline_schedule) def match_ref?(pattern, ref, tag, source)
pattern, path = pattern.split('@', 2) pattern, path = pattern.split('@', 2)
return false if path && path != self.path return false if path && path != self.path
return true if tag && pattern == 'tags' return true if tag && pattern == 'tags'
return true if !tag && pattern == 'branches' return true if !tag && pattern == 'branches'
return true if trigger_request.present? && pattern == 'triggers' return true if source == 'trigger' && pattern == 'triggers'
return true if pipeline_schedule.present? && pattern == 'schedules' return true if source == 'schedule' && pattern == 'schedules'
if pattern.first == "/" && pattern.last == "/" if pattern.first == "/" && pattern.last == "/"
Regexp.new(pattern[1...-1]) =~ ref Regexp.new(pattern[1...-1]) =~ ref
......
...@@ -227,7 +227,7 @@ module Ci ...@@ -227,7 +227,7 @@ module Ci
config_processor = GitlabCiYamlProcessor.new(config, path) config_processor = GitlabCiYamlProcessor.new(config, path)
expect(config_processor.builds_for_stage_and_ref(type, "deploy", false, true).size).to eq(1) expect(config_processor.builds_for_stage_and_ref(type, "deploy", false, 'trigger').size).to eq(1)
end end
it "returns builds if only has a schedules keyword specified and a schedule is provided" do it "returns builds if only has a schedules keyword specified and a schedule is provided" do
...@@ -238,7 +238,7 @@ module Ci ...@@ -238,7 +238,7 @@ module Ci
config_processor = GitlabCiYamlProcessor.new(config, path) config_processor = GitlabCiYamlProcessor.new(config, path)
expect(config_processor.builds_for_stage_and_ref(type, "deploy", false, false, true).size).to eq(1) expect(config_processor.builds_for_stage_and_ref(type, "deploy", false, 'schedule').size).to eq(1)
end end
it "does not return builds if only has a triggers keyword specified and no trigger is provided" do it "does not return builds if only has a triggers keyword specified and no trigger is provided" do
...@@ -405,7 +405,7 @@ module Ci ...@@ -405,7 +405,7 @@ module Ci
config_processor = GitlabCiYamlProcessor.new(config, path) config_processor = GitlabCiYamlProcessor.new(config, path)
expect(config_processor.builds_for_stage_and_ref(type, "deploy", false, true).size).to eq(0) expect(config_processor.builds_for_stage_and_ref(type, "deploy", false, 'trigger').size).to eq(0)
end end
it "does not return builds if except has a schedules keyword specified and a schedule is provided" do it "does not return builds if except has a schedules keyword specified and a schedule is provided" do
...@@ -416,7 +416,7 @@ module Ci ...@@ -416,7 +416,7 @@ module Ci
config_processor = GitlabCiYamlProcessor.new(config, path) config_processor = GitlabCiYamlProcessor.new(config, path)
expect(config_processor.builds_for_stage_and_ref(type, "deploy", false, false, true).size).to eq(0) expect(config_processor.builds_for_stage_and_ref(type, "deploy", false, 'schedule').size).to eq(0)
end end
it "returns builds if except has a triggers keyword specified and no trigger is provided" do it "returns builds if except has a triggers keyword specified and no trigger is provided" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment