Add latest changes from gitlab-org/gitlab@13-0-stable-ee

3 files changed, 18 insertions, 1 deletions

diff --git a/lib/gitlab/ci/pipeline/chain/command.rb b/lib/gitlab/ci/pipeline/chain/command.rb
index fa46114615c..73187401903 100644
--- a/lib/gitlab/ci/pipeline/chain/command.rb
+++ b/lib/gitlab/ci/pipeline/chain/command.rb
@@ -76,6 +76,21 @@ module Gitlab
           def parent_pipeline
             bridge&.parent_pipeline
           end
+
+          def duration_histogram
+            strong_memoize(:duration_histogram) do
+              name = :gitlab_ci_pipeline_creation_duration_seconds
+              comment = 'Pipeline creation duration'
+              labels = {}
+              buckets = [0.01, 0.05, 0.1, 0.5, 1.0, 2.0, 5.0, 20.0, 50.0, 240.0]
+
+              Gitlab::Metrics.histogram(name, comment, labels, buckets)
+            end
+          end
+
+          def observe_creation_duration(duration)
+            duration_histogram.observe({}, duration.seconds)
+          end
         end
       end
     end
diff --git a/lib/gitlab/ci/pipeline/chain/sequence.rb b/lib/gitlab/ci/pipeline/chain/sequence.rb
index 99780409085..a7c671e76d3 100644
--- a/lib/gitlab/ci/pipeline/chain/sequence.rb
+++ b/lib/gitlab/ci/pipeline/chain/sequence.rb
@@ -10,6 +10,7 @@ module Gitlab
             @command = command
             @sequence = sequence
             @completed = []
+            @start = Time.now
           end
 
           def build!
@@ -24,6 +25,8 @@ module Gitlab
 
             @pipeline.tap do
               yield @pipeline, self if block_given?
+
+              @command.observe_creation_duration(Time.now - @start)
             end
           end
 
diff --git a/lib/gitlab/ci/pipeline/seed/build/resource_group.rb b/lib/gitlab/ci/pipeline/seed/build/resource_group.rb
index 3bec6d1e8b6..c0641d9ff0a 100644
--- a/lib/gitlab/ci/pipeline/seed/build/resource_group.rb
+++ b/lib/gitlab/ci/pipeline/seed/build/resource_group.rb
@@ -16,7 +16,6 @@ module Gitlab
             end
 
             def to_resource
-              return unless Feature.enabled?(:ci_resource_group, build.project, default_enabled: true)
               return unless resource_group_key.present?
 
               resource_group = build.project.resource_groups