gitlab-qa 8.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b328348db20338194b52a69ad58985c4f48bfec8b9a7989b44a1840c6d27d2
-  data.tar.gz: 11aaf09daf2aac04f0f06e626087230b959ee68eba236c516ae4ce28df808817
+  metadata.gz: 8cc0b13405340964bb5e0a19cb21457d70543c5f3de8f023a31527b91feb8b0c
+  data.tar.gz: 64f23b12774640295fe5093a45b00e3d721266440b5bb359b3aad754adf0a4b5
 SHA512:
-  metadata.gz: bd385edcc561ad24faf5cba3b3e8ed28ff444b3b801224657c3bfd425a759c4eb39a0090e9425dedba48b0c20be6ed6a9624e41e06e304bb929c1a1b2905f30c
-  data.tar.gz: d5b8fd24b8f23e8f9bc291c626261f200f54795df0ea613bca59a59e63c34779842657954f6a52b53c92fe466e203ff2aefa0c0501cef8e120ed4c3cd33acd6a
+  metadata.gz: a65f92e629724d354ab3cf038367ffb1002d27b35b3a8e5add2e1c82c08a718e20c57bc59e11ad1cbb466aa25041a4f00c87882d3fce18b7b3f3337d2c93f329
+  data.tar.gz: 977e2feec2033cd0a3cc325025c149568edab4a62b47e5f37a2bcda9ef6f2ec09f2183d48be1129d2bd85caea4b0911f96a882de45f4414d04cab4f86a400a05

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

@@ -0,0 +1,49 @@
+ce:metrics:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .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"
+
+ce:metrics-quarantine:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .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"
+
+ee:metrics:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .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"
+
+ee:metrics-quarantine:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .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"

data/.gitlab-ci.yml

@@ -105,6 +105,7 @@ generate-jobs:
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag can_use_large_setup
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag cloud_activation
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag object_storage
+    - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag metrics
     - cp -r no_of_examples $CI_PROJECT_DIR
 
     # TOP_UPSTREAM_DEFAULT_BRANCH is the default branch name of the original project that triggered a pipeline in this project.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.1.0)
+    gitlab-qa (8.2.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

data/docs/what_tests_can_be_run.md

@@ -84,6 +84,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_INFLUXDB_TOKEN` |- | Influxdb token for test metrics reporting | No|
 | `QA_RUN_TYPE` |- | QA run type like `staging-full`, `canary`, `production` etc. Used in test metrics reporting | No|
 | `QA_VALIDATE_RESOURCE_REUSE` | `false` | Set to `true` to [validate resource reuse](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/resources.html#reusable-resources) after a test suite | No |
+| `QA_USE_PUBLIC_IP_API` | `false` | When performing Instance tests against a remote/pre-existing instance, use an API to detect the public API for requests coming from gitlab-qa.  Used by tests that exercise IP-address restrictions and similar
 | `GITHUB_USERNAME` |-  | Username for authenticating with GitHub. | No|
 | `GITHUB_PASSWORD` |-  | Password for authenticating with GitHub. | No|
 | `GITLAB_QA_LOOP_RUNNER_MINUTES` | `1` | Minutes to run and repeat a spec while using the '--loop' option; default value is 1 minute. | No|

data/lib/gitlab/qa/runtime/env.rb

@@ -43,6 +43,7 @@ module Gitlab
           'QA_RUN_TYPE' => :qa_run_type,
           'QA_SKIP_PULL' => :qa_skip_pull,
           'QA_VALIDATE_RESOURCE_REUSE' => :qa_validate_resource_reuse,
+          'QA_USE_PUBLIC_IP_API' => :qa_use_public_ip_api,
           'GITLAB_API_BASE' => :api_base,
           'GITLAB_ADMIN_USERNAME' => :admin_username,
           'GITLAB_ADMIN_PASSWORD' => :admin_password,

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

@@ -0,0 +1,20 @@
+# 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

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.1.0'
+    VERSION = '8.2.0'
   end
 end

data/scripts/generate-qa-jobs.rb

@@ -48,6 +48,7 @@ class GenerateQAJobs
     jobs.merge!(load_yml_contents('cloud_activation', should_automatically_run?('test_instance_all_cloud_activation')))
     jobs.merge!(load_yml_contents('registry_with_cdn', should_automatically_run?('test_integration_registrywithcdn')))
     jobs.merge!(load_yml_contents('staging'))
+    jobs.merge!(load_yml_contents('metrics', should_automatically_run?('test_instance_all_metrics')))
 
     # Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/774
     # jobs.merge!(load_yml_contents('geo', should_automatically_run?('scenario_test_geo')))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -251,6 +251,7 @@ files:
 - ".gitlab/ci/jobs/ldap_no_tls.gitlab-ci.yml"
 - ".gitlab/ci/jobs/ldap_tls.gitlab-ci.yml"
 - ".gitlab/ci/jobs/mattermost.gitlab-ci.yml"
+- ".gitlab/ci/jobs/metrics.gitlab-ci.yml"
 - ".gitlab/ci/jobs/mtls.gitlab-ci.yml"
 - ".gitlab/ci/jobs/object_storage.gitlab-ci.yml"
 - ".gitlab/ci/jobs/object_storage_aws.gitlab-ci.yml"
@@ -357,6 +358,7 @@ files:
 - lib/gitlab/qa/runtime/omnibus_configurations/decomposition_single_db.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/default.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/metrics.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_aws.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb