Merge branch 'mk-metrics-scenario' into 'master'

Replace metrics OmnibusConfig with Scenario class

See merge request gitlab-org/gitlab-qa!1016

.gitlab/ci/jobs/metrics.gitlab-ci.yml

@@ -5,10 +5,8 @@ ce:metrics:
     - .high-capacity
     - .ce-variables
     - .rspec-report-opts
-    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config metrics"
-    QA_RSPEC_TAGS: "--tag metrics"
+    QA_SCENARIO: "Test::Integration::Metrics"
 ce:metrics-quarantine:
   extends:
@@ -18,10 +16,8 @@ ce:metrics-quarantine:
     - .ce-variables
     - .quarantine
     - .rspec-report-opts
-    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config metrics"
-    QA_RSPEC_TAGS: "--tag metrics"
+    QA_SCENARIO: "Test::Integration::Metrics"
 ee:metrics:
   extends:
@@ -30,10 +26,8 @@ ee:metrics:
     - .high-capacity
     - .ee-variables
     - .rspec-report-opts
-    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config metrics"
-    QA_RSPEC_TAGS: "--tag metrics"
+    QA_SCENARIO: "Test::Integration::Metrics"
 ee:metrics-quarantine:
   extends:
@@ -43,7 +37,5 @@ ee:metrics-quarantine:
     - .ee-variables
     - .quarantine
     - .rspec-report-opts
-    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config metrics"
-    QA_RSPEC_TAGS: "--tag quarantine --tag metrics"
+    QA_SCENARIO: "Test::Integration::Metrics"

lib/gitlab/qa/runtime/omnibus_configurations/metrics.rb

-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Runtime
-      module OmnibusConfigurations
-        class Metrics < Default
-          def configuration
-            <<~RUBY
-              puma['exporter_enabled'] = true
-              puma['exporter_port'] = 8083
-              sidekiq['metrics_enabled'] = true
-              sidekiq['listen_port'] = 8082
-            RUBY
-          end
-        end
-      end
-    end
-  end
-end

lib/gitlab/qa/scenario/test/integration/metrics.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Metrics < Scenario::Template
+            PUMA_METRICS_SERVER_PORT = 8083
+            SIDEKIQ_METRICS_SERVER_PORT = 8082
+
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+                gitlab.name = 'gitlab'
+                gitlab.ports = [PUMA_METRICS_SERVER_PORT, SIDEKIQ_METRICS_SERVER_PORT]
+
+                gitlab.omnibus_configuration << <<~RUBY
+                  puma['exporter_enabled'] = true
+                  puma['exporter_port'] = #{PUMA_METRICS_SERVER_PORT}
+                  sidekiq['metrics_enabled'] = true
+                  sidekiq['listen_port'] = #{SIDEKIQ_METRICS_SERVER_PORT}
+                RUBY
+
+                gitlab.instance do
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Integration::Metrics'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

spec/gitlab/qa/runtime/omnibus_configuration_spec.rb

@@ -177,18 +177,5 @@ module Gitlab::QA::Runtime
         end
       end
     end
-
-    describe OmnibusConfigurations::Metrics do
-      describe '#configuration' do
-        subject { described_class.new }
-
-        it 'enables dedicated metrics servers' do
-          expect(subject.configuration).to include("puma['exporter_enabled'] = true")
-          expect(subject.configuration).to include("puma['exporter_port'] = 8083")
-          expect(subject.configuration).to include("sidekiq['metrics_enabled'] = true")
-          expect(subject.configuration).to include("sidekiq['listen_port'] = 8082")
-        end
-      end
-    end
   end
 end