diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-31 18:39:19 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-04 13:21:31 +0100 |
| commit | 181627f9ef600c544eb827d2722f65a3515a9181 (patch) | |
| tree | e5f5900dcac48c62b11f296bb95c8b79666eff2d /app/services/ci | |
| parent | c48f29c15989d260ccb72d3e4bf5973a5e0f2d25 (diff) | |
| download | gitlab-ce-181627f9ef600c544eb827d2722f65a3515a9181.tar.gz | |
Reduce the diff with EE in Ci::CreatePipelineService
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/services/ci')
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index f8d8ef04001..699b3e8555e 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -7,14 +7,17 @@ module Ci CreateError = Class.new(StandardError) SEQUENCE = [Gitlab::Ci::Pipeline::Chain::Build, + Gitlab::Ci::Pipeline::Chain::RemoveUnwantedChatJobs, Gitlab::Ci::Pipeline::Chain::Validate::Abilities, Gitlab::Ci::Pipeline::Chain::Validate::Repository, Gitlab::Ci::Pipeline::Chain::Validate::Config, Gitlab::Ci::Pipeline::Chain::Skip, + Gitlab::Ci::Pipeline::Chain::Limit::Size, Gitlab::Ci::Pipeline::Chain::Populate, - Gitlab::Ci::Pipeline::Chain::Create].freeze + Gitlab::Ci::Pipeline::Chain::Create, + Gitlab::Ci::Pipeline::Chain::Limit::Activity].freeze - def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, merge_request: nil, &block) + def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, merge_request: nil, **options, &block) @pipeline = Ci::Pipeline.new command = Gitlab::Ci::Pipeline::Chain::Command.new( @@ -32,7 +35,8 @@ module Ci variables_attributes: params[:variables_attributes], project: project, current_user: current_user, - push_options: params[:push_options]) + push_options: params[:push_options], + **extra_options(**options)) sequence = Gitlab::Ci::Pipeline::Chain::Sequence .new(pipeline, command, SEQUENCE) @@ -103,5 +107,9 @@ module Ci pipeline.project.source_of_merge_requests.opened.where(source_branch: pipeline.ref) end # rubocop: enable CodeReuse/ActiveRecord + + def extra_options + {} # overriden in EE + end end end |