diff options
Diffstat (limited to 'app/services/ci/create_pipeline_service.rb')
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index c039f31aafc..ba9665555cc 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -11,11 +11,11 @@ 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::SeedBlock, Gitlab::Ci::Pipeline::Chain::EvaluateWorkflowRules, Gitlab::Ci::Pipeline::Chain::Seed, @@ -87,12 +87,16 @@ module Ci if pipeline.persisted? schedule_head_pipeline_update create_namespace_onboarding_action + else + # If pipeline is not persisted, try to recover IID + pipeline.reset_project_iid end - # If pipeline is not persisted, try to recover IID - pipeline.reset_project_iid unless pipeline.persisted? - - pipeline + if error_message = pipeline.full_error_messages.presence || pipeline.failure_reason.presence + ServiceResponse.error(message: error_message, payload: pipeline) + else + ServiceResponse.success(payload: pipeline) + end end # rubocop: enable Metrics/ParameterLists @@ -100,8 +104,8 @@ module Ci source = args[0] params = Hash(args[1]) - execute(source, **params, &block).tap do |pipeline| - unless pipeline.persisted? + execute(source, **params, &block).tap do |response| + unless response.payload.persisted? raise CreateError, pipeline.full_error_messages end end |