diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2017-05-08 01:35:56 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-08 01:35:56 +0300 |
| commit | 8df3997a92bffa2d29f3c559933a336b837cdb93 (patch) | |
| tree | 5ee50876b35b6c5fd40607665f72468cfcee51fe /app/services | |
| parent | 8a0cde81feb3c8f3af26eefa5cef7b72eda2d266 (diff) | |
Add Pipeline Schedules that supersedes experimental Trigger Schedule
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/create_pipeline_schedule_service.rb | 13 | ||||
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 5 | ||||
| -rw-r--r-- | app/services/ci/create_trigger_request_service.rb | 5 |
3 files changed, 18 insertions, 5 deletions
diff --git a/app/services/ci/create_pipeline_schedule_service.rb b/app/services/ci/create_pipeline_schedule_service.rb new file mode 100644 index 00000000000..cd40deb6187 --- /dev/null +++ b/app/services/ci/create_pipeline_schedule_service.rb @@ -0,0 +1,13 @@ +module Ci + class CreatePipelineScheduleService < BaseService + def execute + project.pipeline_schedules.create(pipeline_schedule_params) + end + + private + + def pipeline_schedule_params + params.merge(owner: current_user) + end + end +end diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 21350be5557..ccdda08d885 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -2,7 +2,7 @@ module Ci class CreatePipelineService < BaseService attr_reader :pipeline - def execute(ignore_skip_ci: false, save_on_errors: true, trigger_request: nil) + def execute(ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil) @pipeline = Ci::Pipeline.new( project: project, ref: ref, @@ -10,7 +10,8 @@ module Ci before_sha: before_sha, tag: tag?, trigger_requests: Array(trigger_request), - user: current_user + user: current_user, + pipeline_schedule: schedule ) unless project.builds_enabled? diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb index dca5aa9f5d7..8362f01ddb8 100644 --- a/app/services/ci/create_trigger_request_service.rb +++ b/app/services/ci/create_trigger_request_service.rb @@ -5,9 +5,8 @@ module Ci pipeline = Ci::CreatePipelineService.new(project, trigger.owner, ref: ref). execute(ignore_skip_ci: true, trigger_request: trigger_request) - if pipeline.persisted? - trigger_request - end + + trigger_request if pipeline.persisted? end end end |