From 755301a2ad1d307c727e3c2642c9e234a7ddb05d Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 29 Jul 2016 00:37:35 +0800
Subject: [PATCH] Also touch the pipeline so we could just hook into
update_state
---
app/models/ci/pipeline.rb | 13 +++++++------
app/services/ci/create_pipeline_service.rb | 1 +
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 7d23456cdac..cd6ead4ded2 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -213,12 +213,6 @@ module Ci
]
end
- def execute_hooks
- pipeline_data = Gitlab::DataBuilder::PipelineDataBuilder.build(self)
- project.execute_hooks(pipeline_data, :pipeline_hooks)
- project.execute_services(pipeline_data.dup, :pipeline_hooks)
- end
-
private
def build_builds_for_stages(stages, user, status, trigger_request)
@@ -244,6 +238,13 @@ module Ci
self.finished_at = statuses.finished_at
self.duration = statuses.latest.duration
save
+ execute_hooks
+ end
+
+ def execute_hooks
+ pipeline_data = Gitlab::DataBuilder::PipelineDataBuilder.build(self)
+ project.execute_hooks(pipeline_data, :pipeline_hooks)
+ project.execute_services(pipeline_data.dup, :pipeline_hooks)
end
def keep_around_commits
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index be91bf0db85..7a8b0683acb 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -27,6 +27,7 @@ module Ci
end
pipeline.save!
+ pipeline.touch
unless pipeline.create_builds(current_user)
pipeline.errors.add(:base, 'No builds for this pipeline.')
--
GitLab