1 files changed, 20 insertions, 5 deletions
diff --git a/lib/gitlab/ci/pipeline/duration.rb b/lib/gitlab/ci/pipeline/duration.rb
index e8a991026b5..573d4c25b91 100644
--- a/lib/gitlab/ci/pipeline/duration.rb
+++ b/lib/gitlab/ci/pipeline/duration.rb
@@ -82,6 +82,8 @@ module Gitlab
       module Duration
         extend self
 
+        STATUSES = %w[success failed running canceled].freeze
+
         Period = Struct.new(:first, :last) do
           def duration
             last - first
@@ -90,14 +92,15 @@ module Gitlab
 
         # rubocop: disable CodeReuse/ActiveRecord
         def from_pipeline(pipeline)
-          status = %w[success failed running canceled]
-          builds = pipeline.processables.latest
-            .where(status: status).where.not(started_at: nil).order(:started_at)
+          builds =
+            self_and_downstreams_builds_of_pipeline(pipeline)
 
           from_builds(builds)
         end
         # rubocop: enable CodeReuse/ActiveRecord
 
+        private
+
         def from_builds(builds)
           now = Time.now
 
@@ -113,8 +116,6 @@ module Gitlab
           process_duration(process_periods(periods))
         end
 
-        private
-
         def process_periods(periods)
           return periods if periods.empty?
 
@@ -139,6 +140,20 @@ module Gitlab
         end
 
         # rubocop: disable CodeReuse/ActiveRecord
+        def self_and_downstreams_builds_of_pipeline(pipeline)
+          ::Ci::Build
+            .select(:id, :type, :started_at, :finished_at)
+            .in_pipelines(
+              pipeline.self_and_downstreams.select(:id)
+            )
+            .with_status(STATUSES)
+            .latest
+            .where.not(started_at: nil)
+            .order(:started_at)
+        end
+        # rubocop: enable CodeReuse/ActiveRecord
+
+        # rubocop: disable CodeReuse/ActiveRecord
         def process_duration(periods)
           periods.sum(&:duration)
         end