RubyGems - gitlab-qa - Versions diffs - 14.10.0 → 14.11.0 - Mend

gitlab-qa 14.10.0 → 14.11.0

Files changed (41) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6f7bd80ea293183e6498166dfff6ed48a13ae11c6075fbb4a6b8da659486f0c
-  data.tar.gz: 1fb02c24469c15088ebaa23607df22dac8237c98afdf3e641bb21c9544d2a6f8
+  metadata.gz: 0f1cb43d060925e3dd20830d8412563a94fca6fb8ad0636de7da5176b984c4e5
+  data.tar.gz: c6096e3712816f0c5667208d219f7e25ce125a869dc4c8b689e89e7c8c85242e
 SHA512:
-  metadata.gz: f3f8343857638e8ed1c2b1b496bf9f09094fddd9d14f477d7277bd71c37d967e7ecce22eb369e6a105df956a48b7ce92831812aa82356f82578bfaa6b847f1ca
-  data.tar.gz: 5ca6e86b327ad376cbae3d58184c8f0ce348f8c6830078b4fd202a16c4ec523ced8ee5e68adf89aa2c79e6a71d40f57955f43271c5fef967661b45078b214e7b
+  metadata.gz: 526945385fb2c815c5cc5b7d17b7327523f099f0f08d123185041cde9142231664c62d253b96ae5262dc9519420cf79aa924750313e07af2c822c1bae528509d
+  data.tar.gz: 2782d95be4f96c1a67a1696b96bb0e8cdaa84fc0a273ac671c39925615b884c6f7e2645df4a3e95d5e74b812e82ad00af0a0a741bf4d144536764fa1d5b16a60

data/.gitlab-ci.yml CHANGED Viewed

@@ -10,7 +10,7 @@
 include:
   - component: gitlab.com/gitlab-org/components/danger-review/danger-review@~latest
     inputs:
-      job_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}"
+      job_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}"
   - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
 stages:
@@ -20,7 +20,7 @@ stages:
   - deploy
 default:
-  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}
+  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}
   tags:
     - gitlab-org
   cache:
@@ -43,8 +43,7 @@ workflow:
 variables:
   DEBIAN_VERSION: bookworm
   DOCKER_VERSION: "24.0.5"
-  BUNDLER_VERSION: "2.5"
-  RUBY_VERSION: "3.1"
+  RUBY_VERSION: "3.1.5"
   BUNDLE_PATH: vendor
   BUNDLE_SILENCE_ROOT_WARNING: "true"
   BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true"
@@ -145,7 +144,6 @@ package-and-test:
       - RUBY_VERSION
       - DEBIAN_VERSION
       - DOCKER_VERSION
-      - BUNDLER_VERSION
   trigger:
     strategy: depend
     forward:

data/.rubocop_todo.yml CHANGED Viewed

@@ -55,7 +55,6 @@ Metrics/AbcSize:
     - 'lib/gitlab/qa/scenario/test/integration/registry_with_cdn.rb'
     - 'lib/gitlab/qa/scenario/test/integration/smtp.rb'
     - 'lib/gitlab/qa/scenario/test/integration/suggested_reviewer.rb'
-    - 'lib/gitlab/qa/scenario/test/sanity/version.rb'
 # Offense count: 2
 # Configuration parameters: CheckIdentifiers, CheckConstants, CheckVariables, CheckStrings, CheckSymbols, CheckComments, CheckFilepaths, FlaggedTerms.

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (14.10.0)
+    gitlab-qa (14.11.0)
       activesupport (>= 6.1, < 7.2)
       gitlab (~> 4.19)
       http (~> 5.0)

data/docs/what_tests_can_be_run.md CHANGED Viewed

@@ -63,6 +63,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_EE_ACTIVATION_CODE` |-  | Cloud activation code to enable Enterprise Edition features. | No|
 | `QA_ARTIFACTS_DIR` |`/tmp/gitlab-qa`| Path to a directory where artifacts (logs and screenshots) for failing tests will be saved. | No|
 | `DOCKER_HOST` |`http://localhost`| Docker host to run tests against. | No|
+| `QA_DOCKER_NETWORK` | `test` | Name of the Docker network that is created to allow connectivity between GitLab and other containers. | No |
 | `WEBDRIVER_HEADLESS` |-  | When running locally, set to `false` to allow Chrome tests to be visible - watch your tests being run. | No|
 | `CHROME_DISABLE_DEV_SHM` | `false` | Set to `true` to disable `/dev/shm` usage in Chrome on Linux. | No|
 | `QA_ADDITIONAL_REPOSITORY_STORAGE` |-  | The name of additional, non-default storage to be used with tests tagged `repository_storage`, run via the `Test::Instance::RepositoryStorage` scenario.  Note: Admin access is required to change repository storage. | No|
@@ -333,7 +334,7 @@ Scenario verifies upgrade from previous (major|minor) version to current release
 - Deploys previous (major|minor) version and runs Smoke test suite
   to populate data in database before upgrade
 - Generates upgrade path following current GitLab recommendations
-  from ['gitlab-com/support/toolbox/upgrade-path'](https://gitlab.com/gitlab-com/support/toolbox/upgrade-path/-/raw/main/upgrade-path.yml) project
+  from ['gitlab.com/gitlab-org/gitlab'](https://gitlab.com/gitlab-org/gitlab/-/raw/master/config/upgrade_path.yml) project
 - Gradually upgrades GitLab instances to `<current_version>`
   associated with provided `<full image address>` and runs tests against it
@@ -883,9 +884,9 @@ $ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
 $ gitlab-qa Test::Instance::StagingRef
 ```
-### `Test::Instance::StagingGeo`
+### `Test::Instance::StagingRefGeo`
-This scenario tests that the Geo staging deployment (with [`staging.gitlab.com`](https://staging.gitlab.com) as the primary site and [`geo.staging.gitlab.com`](https://geo.staging.gitlab.com) as the secondary site) works as expected by running tests tagged `:geo` against it. This is done by spinning up a GitLab QA (`gitlab/gitlab-qa`) container and running the `QA::EE::Scenario::Test::Geo` scenario. Note that the Geo setup steps in the `QA::EE::Scenario::Test::Geo` scenario are skipped when testing a live Geo deployment.
+This scenario tests that the Geo staging deployment (with [`staging-ref.gitlab.com`](https://staging-ref.gitlab.com) as the primary site and [`geo.staging-ref.gitlab.com`](https://geo.staging-ref.gitlab.com) as the secondary site) works as expected by running tests tagged `:geo` against it. This is done by spinning up a GitLab QA (`gitlab/gitlab-qa`) container and running the `QA::EE::Scenario::Test::Geo` scenario. Note that the Geo setup steps in the `QA::EE::Scenario::Test::Geo` scenario are skipped when testing a live Geo deployment.
 **Required user properties:**
@@ -907,23 +908,6 @@ This scenario tests that the Geo staging deployment (with [`staging.gitlab.com`]
   If the variable isn't present, the QA image from Docker Hub will be used.
   This can be found in the shared 1Password vault.
-Example:
-```shell
-$ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
-$ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
-$ export GITLAB_USERNAME="gitlab-qa"
-$ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
-$ gitlab-qa Test::Instance::StagingGeo
-```
-### `Test::Instance::StagingRefGeo`
-This scenario tests that the Geo staging deployment (with [`staging-ref.gitlab.com`](https://staging-ref.gitlab.com) as the primary site and [`geo.staging-ref.gitlab.com`](https://geo.staging-ref.gitlab.com) as the secondary site) works as expected by running tests tagged `:geo` against it. This is done by spinning up a GitLab QA (`gitlab/gitlab-qa`) container and running the `QA::EE::Scenario::Test::Geo` scenario. Note that the Geo setup steps in the `QA::EE::Scenario::Test::Geo` scenario are skipped when testing a live Geo deployment.
-Scenario requirements are the same as [`Test::Instance::StagingGeo`](#testinstancestaginggeo) described above.
 ```shell
 $ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
 $ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
@@ -1034,7 +1018,7 @@ These tests verify features related to multiple repository storages.
 Example:
 ```shell
-$ export QA_ADDITIONAL_REPOSITORY_STORAGE=secondary
+$ export QA_ADDITIONAL_REPOSITORY_STORAGE=secondary
 $ export QA_GITALY_NON_CLUSTER_STORAGE=gitaly
 $ export QA_PRAEFECT_REPOSITORY_STORAGE=praefect

data/lib/gitlab/qa/component/chaos.rb CHANGED Viewed

@@ -11,7 +11,7 @@ module Gitlab
         def initialize
           super
-          @network = "test"
+          @network = Runtime::Env.docker_network
         end
         def name

data/lib/gitlab/qa/component/gitaly_cluster.rb CHANGED Viewed

@@ -16,7 +16,7 @@ module Gitlab
           def initialize(params = {}) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
             @gitlab_name = params[:gitlab_name] || 'gitlab-gitaly-cluster'
-            @network = params[:network] || 'test'
+            @network = params[:network] || Runtime::Env.docker_network
             @airgapped_network = params[:airgapped_network] || false
             @praefect_node_name = params[:praefect_node_name] || 'praefect'

data/lib/gitlab/qa/runner.rb CHANGED Viewed

@@ -93,7 +93,6 @@ module Gitlab
           scenario = Scenario.const_get(args.shift)
           load_omnibus_configurations
-          load_telegraf(scenario)
           begin
             @active_configurators.compact.each do |configurator|
@@ -129,18 +128,6 @@ module Gitlab
         end.compact
       end
-      # Start telegraf agent for metrics collection
-      #
-      # Do not load when running against external instance
-      #
-      # @param [Class] scenario
-      # @return [void]
-      def self.load_telegraf(scenario)
-        return if scenario <= Scenario::Test::Instance::DeploymentBase || scenario == Scenario::Test::Instance::Any
-        @active_configurators << Component::Telegraf.new
-      end
       def self.load_omnibus_configurations
         # OmnibusConfiguration::Test       => --test
         # OmnibusConfiguration::HelloThere => --hello_there

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

@@ -17,156 +17,156 @@ module Gitlab
         # Any new key-value pairs should also be added to the hash at /rubocop/cop/gitlab/dangerous_interpolation.rb
         # to prevent Rubocop errors.
         ENV_VARIABLES = {
-          'QA_IMAGE' => :qa_image,
-          'QA_REMOTE_GRID' => :remote_grid,
-          'QA_REMOTE_GRID_USERNAME' => :remote_grid_username,
-          'QA_REMOTE_GRID_ACCESS_KEY' => :remote_grid_access_key,
-          'QA_REMOTE_GRID_PROTOCOL' => :remote_grid_protocol,
-          'QA_REMOTE_MOBILE_DEVICE_NAME' => :remote_mobile_device_name,
-          'QA_REMOTE_TUNNEL_ID' => :remote_tunnel_id,
-          'QA_BROWSER' => :browser,
-          'QA_SELENOID_BROWSER_VERSION' => :selenoid_browser_version,
-          'QA_RECORD_VIDEO' => :record_video,
-          'QA_LAYOUT' => :layout,
-          'QA_VIDEO_RECORDER_IMAGE' => :video_recorder_image,
-          'QA_VIDEO_RECORDER_VERSION' => :video_recorder_version,
-          'QA_SELENOID_BROWSER_IMAGE' => :selenoid_browser_image,
-          'QA_ADDITIONAL_REPOSITORY_STORAGE' => :qa_additional_repository_storage,
-          'QA_PRAEFECT_REPOSITORY_STORAGE' => :qa_praefect_repository_storage,
-          'QA_GITALY_NON_CLUSTER_STORAGE' => :qa_gitaly_non_cluster_storage,
-          'QA_COOKIES' => :qa_cookie,
-          'QA_DEBUG' => :qa_debug,
-          'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
-          'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
-          'QA_CAN_TEST_PRAEFECT' => :qa_can_test_praefect,
-          'QA_SIMULATE_SLOW_CONNECTION' => :qa_simulate_slow_connection,
-          'QA_SLOW_CONNECTION_LATENCY_MS' => :qa_slow_connection_latency_ms,
-          'QA_SLOW_CONNECTION_THROUGHPUT_KBPS' => :qa_slow_connection_throughput_kbps,
-          'QA_GENERATE_ALLURE_REPORT' => :generate_allure_report,
-          'QA_EXPORT_TEST_METRICS' => :qa_export_test_metrics,
-          'QA_INFLUXDB_URL' => :qa_influxdb_url,
-          'QA_INFLUXDB_TOKEN' => :qa_influxdb_token,
-          'QA_SKIP_PULL' => :qa_skip_pull,
-          'QA_VALIDATE_RESOURCE_REUSE' => :qa_validate_resource_reuse,
-          'WEBDRIVER_HEADLESS' => :webdriver_headless,
-          'GITLAB_ADMIN_USERNAME' => :admin_username,
-          'GITLAB_ADMIN_PASSWORD' => :admin_password,
-          'GITLAB_USERNAME' => :user_username,
-          'GITLAB_PASSWORD' => :user_password,
-          'GITLAB_LDAP_USERNAME' => :ldap_username,
-          'GITLAB_LDAP_PASSWORD' => :ldap_password,
-          'GITLAB_FORKER_USERNAME' => :forker_username,
-          'GITLAB_FORKER_PASSWORD' => :forker_password,
-          'GITLAB_USER_TYPE' => :user_type,
-          'GITLAB_SANDBOX_NAME' => :gitlab_sandbox_name,
-          'GITLAB_QA_ACCESS_TOKEN' => :qa_access_token,
-          'GITLAB_QA_ADMIN_ACCESS_TOKEN' => :qa_admin_access_token,
-          'GITLAB_QA_DEV_ACCESS_TOKEN' => :qa_dev_access_token,
-          'GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN' => :qa_container_registry_access_token,
-          'GITHUB_ACCESS_TOKEN' => :github_access_token,
-          'GITLAB_URL' => :gitlab_url,
-          'SIMPLE_SAML_HOSTNAME' => :simple_saml_hostname,
-          'SIMPLE_SAML_FINGERPRINT' => :simple_saml_fingerprint,
           'ACCEPT_INSECURE_CERTS' => :accept_insecure_certs,
-          'EE_LICENSE' => :ee_license,
-          'GCLOUD_ACCOUNT_EMAIL' => :gcloud_account_email,
-          'GCLOUD_ACCOUNT_KEY' => :gcloud_account_key,
-          'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
-          'GCLOUD_REGION' => :gcloud_region,
-          'SIGNUP_DISABLED' => :signup_disabled,
-          'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
-          'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
-          'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
-          'GITLAB_QA_PASSWORD_2' => :gitlab_qa_password_2,
-          'QA_GITHUB_USERNAME' => :qa_github_username,
-          'QA_GITHUB_PASSWORD' => :qa_github_password,
-          'QA_GITLAB_HOSTNAME' => :qa_gitlab_hostname,
-          'QA_GITLAB_USE_TLS' => :qa_gitlab_use_tls,
-          'KNAPSACK_GENERATE_REPORT' => :knapsack_generate_report,
-          'KNAPSACK_REPORT_PATH' => :knapsack_report_path,
-          'KNAPSACK_TEST_FILE_PATTERN' => :knapsack_test_file_pattern,
-          'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
-          'NO_KNAPSACK' => :no_knapsack,
-          'QA_KNAPSACK_REPORT_GCS_CREDENTIALS' => :qa_knapsack_report_gcs_credentials,
-          'QA_KNAPSACK_REPORT_PATH' => :qa_knapsack_report_path,
-          'QA_RSPEC_REPORT_PATH' => :qa_rspec_report_path,
-          'RSPEC_FAST_QUARANTINE_PATH' => :rspec_fast_quarantine_path,
-          'RSPEC_SKIPPED_TESTS_REPORT_PATH' => :skipped_tests_report_path,
+          'AWS_S3_ACCESS_KEY' => :aws_s3_access_key,
+          'AWS_S3_BUCKET_NAME' => :aws_s3_bucket_name,
+          'AWS_S3_KEY_ID' => :aws_s3_key_id,
+          'AWS_S3_REGION' => :aws_s3_region,
+          'CACHE_NAMESPACE_NAME' => :cache_namespace_name,
+          'CHROME_DISABLE_DEV_SHM' => :chrome_disable_dev_shm,
           'CI' => :ci,
+          'CI_JOB_ID' => :ci_job_id,
           'CI_JOB_NAME' => :ci_job_name,
           'CI_JOB_NAME_SLUG' => :ci_job_name_slug,
-          'CI_JOB_ID' => :ci_job_id,
-          'CI_JOB_URL' => :ci_job_url,
           'CI_JOB_TOKEN' => :ci_job_token,
-          'CI_RUNNER_ID' => :ci_runner_id,
-          'CI_SERVER_HOST' => :ci_server_host,
-          'CI_SERVER_PERSONAL_ACCESS_TOKEN' => :ci_server_personal_access_token,
+          'CI_JOB_URL' => :ci_job_url,
+          'CI_MERGE_REQUEST_IID' => :ci_merge_request_iid,
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
+          'CI_PIPELINE_CREATED_AT' => :ci_pipeline_created_at,
+          'CI_PIPELINE_ID' => :ci_pipeline_id,
+          'CI_PIPELINE_SOURCE' => :ci_pipeline_source,
+          'CI_PIPELINE_URL' => :ci_pipeline_url,
           'CI_PROJECT_NAME' => :ci_project_name,
           'CI_PROJECT_PATH' => :ci_project_path,
           'CI_PROJECT_PATH_SLUG' => :ci_project_path_slug,
-          'CI_PIPELINE_SOURCE' => :ci_pipeline_source,
-          'CI_PIPELINE_ID' => :ci_pipeline_id,
-          'CI_PIPELINE_URL' => :ci_pipeline_url,
-          'CI_PIPELINE_CREATED_AT' => :ci_pipeline_created_at,
-          'CI_MERGE_REQUEST_IID' => :ci_merge_request_iid,
-          'GITLAB_CI' => :gitlab_ci,
+          'CI_RUNNER_ID' => :ci_runner_id,
+          'CI_SERVER_HOST' => :ci_server_host,
+          'CI_SERVER_PERSONAL_ACCESS_TOKEN' => :ci_server_personal_access_token,
+          'COLORIZED_LOGS' => :colorized_logs,
+          'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
+          'EE_LICENSE' => :ee_license,
           'ELASTIC_URL' => :elastic_url,
-          'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
-          'MAILHOG_HOSTNAME' => :mailhog_hostname,
-          'GITLAB_QA_FORMLESS_LOGIN_TOKEN' => :gitlab_qa_formless_login_token,
-          'GEO_MAX_FILE_REPLICATION_TIME' => :geo_max_file_replication_time,
-          'GEO_MAX_DB_REPLICATION_TIME' => :geo_max_db_replication_time,
-          'JIRA_HOSTNAME' => :jira_hostname,
-          'JIRA_ADMIN_USERNAME' => :jira_admin_username,
-          'JIRA_ADMIN_PASSWORD' => :jira_admin_password,
-          'CACHE_NAMESPACE_NAME' => :cache_namespace_name,
-          'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
+          'FIPS' => :fips,
+          'GCS_BUCKET_NAME' => :gcs_bucket_name,
+          'GCS_CDN_BUCKET_NAME' => :gcs_cdn_bucket_name,
+          'GCLOUD_ACCOUNT_EMAIL' => :gcloud_account_email,
+          'GCLOUD_ACCOUNT_KEY' => :gcloud_account_key,
+          'GCLOUD_REGION' => :gcloud_region,
           'GEO_FAILOVER' => :geo_failover,
+          'GEO_MAX_DB_REPLICATION_TIME' => :geo_max_db_replication_time,
+          'GEO_MAX_FILE_REPLICATION_TIME' => :geo_max_file_replication_time,
+          'GITLAB_ADMIN_PASSWORD' => :admin_password,
+          'GITLAB_ADMIN_USERNAME' => :admin_username,
+          'GITLAB_FORKER_PASSWORD' => :forker_password,
+          'GITLAB_FORKER_USERNAME' => :forker_username,
           'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password,
+          'GITLAB_LDAP_PASSWORD' => :ldap_password,
+          'GITLAB_LDAP_USERNAME' => :ldap_username,
+          'GITLAB_PASSWORD' => :user_password,
+          'GITLAB_QA_ACCESS_TOKEN' => :qa_access_token,
+          'GITLAB_QA_ADMIN_ACCESS_TOKEN' => :qa_admin_access_token,
+          'GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN' => :qa_container_registry_access_token,
+          'GITLAB_QA_DEV_ACCESS_TOKEN' => :qa_dev_access_token,
+          'GITLAB_QA_FORMLESS_LOGIN_TOKEN' => :gitlab_qa_formless_login_token,
+          'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
+          'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
+          'GITLAB_QA_PASSWORD_2' => :gitlab_qa_password_2,
+          'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
+          'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
+          'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
+          'GITLAB_SANDBOX_NAME' => :gitlab_sandbox_name,
           'GITLAB_TLS_CERTIFICATE' => :gitlab_tls_certificate,
-          'AWS_S3_REGION' => :aws_s3_region,
-          'AWS_S3_KEY_ID' => :aws_s3_key_id,
-          'AWS_S3_ACCESS_KEY' => :aws_s3_access_key,
-          'AWS_S3_BUCKET_NAME' => :aws_s3_bucket_name,
-          'TOP_UPSTREAM_MERGE_REQUEST_IID' => :top_upstream_merge_request_iid,
-          'GOOGLE_PROJECT' => :google_project,
-          'GOOGLE_CLIENT_EMAIL' => :google_client_email,
-          'GOOGLE_JSON_KEY' => :google_json_key,
+          'GITLAB_URL' => :gitlab_url,
+          'GITLAB_USER_TYPE' => :user_type,
+          'GITLAB_USERNAME' => :user_username,
+          'GITLAB_CI' => :gitlab_ci,
+          'GITHUB_ACCESS_TOKEN' => :github_access_token,
           'GOOGLE_CDN_JSON_KEY' => :google_cdn_json_key,
           'GOOGLE_CDN_LB' => :google_cdn_load_balancer,
           'GOOGLE_CDN_SIGNURL_KEY' => :google_cdn_signurl_key,
           'GOOGLE_CDN_SIGNURL_KEY_NAME' => :google_cdn_signurl_key_name,
-          'GCS_CDN_BUCKET_NAME' => :gcs_cdn_bucket_name,
-          'GCS_BUCKET_NAME' => :gcs_bucket_name,
-          'SMOKE_ONLY' => :smoke_only,
-          'NO_ADMIN' => :no_admin,
-          'CHROME_DISABLE_DEV_SHM' => :chrome_disable_dev_shm,
-          'COLORIZED_LOGS' => :colorized_logs,
-          'FIPS' => :fips,
+          'GOOGLE_CLIENT_EMAIL' => :google_client_email,
+          'GOOGLE_JSON_KEY' => :google_json_key,
+          'GOOGLE_PROJECT' => :google_project,
           'JH_ENV' => :jh_env,
+          'JIRA_ADMIN_PASSWORD' => :jira_admin_password,
+          'JIRA_ADMIN_USERNAME' => :jira_admin_username,
+          'JIRA_HOSTNAME' => :jira_hostname,
+          'KNAPSACK_GENERATE_REPORT' => :knapsack_generate_report,
+          'KNAPSACK_REPORT_PATH' => :knapsack_report_path,
+          'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
+          'KNAPSACK_TEST_FILE_PATTERN' => :knapsack_test_file_pattern,
+          'MAILHOG_HOSTNAME' => :mailhog_hostname,
+          'NO_KNAPSACK' => :no_knapsack,
+          'QA_ADDITIONAL_REPOSITORY_STORAGE' => :qa_additional_repository_storage,
+          'QA_BROWSER' => :browser,
+          'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
+          'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
+          'QA_CAN_TEST_PRAEFECT' => :qa_can_test_praefect,
+          'QA_COOKIES' => :qa_cookie,
+          'QA_DEBUG' => :qa_debug,
+          'QA_DOCKER_NETWORK' => :docker_network,
+          'QA_EXPORT_TEST_METRICS' => :qa_export_test_metrics,
+          'QA_GITALY_NON_CLUSTER_STORAGE' => :qa_gitaly_non_cluster_storage,
           'QA_GITHUB_OAUTH_APP_ID' => :github_oauth_app_id,
           'QA_GITHUB_OAUTH_APP_SECRET' => :github_oauth_app_secret,
+          'QA_GITHUB_PASSWORD' => :qa_github_password,
+          'QA_GITHUB_USERNAME' => :qa_github_username,
+          'QA_GITLAB_HOSTNAME' => :qa_gitlab_hostname,
+          'QA_GITLAB_USE_TLS' => :qa_gitlab_use_tls,
+          'QA_IMAGE' => :qa_image,
+          'QA_INFLUXDB_TOKEN' => :qa_influxdb_token,
+          'QA_INFLUXDB_URL' => :qa_influxdb_url,
+          'QA_KNAPSACK_REPORT_GCS_CREDENTIALS' => :qa_knapsack_report_gcs_credentials,
+          'QA_KNAPSACK_REPORT_PATH' => :qa_knapsack_report_path,
+          'QA_LAYOUT' => :layout,
+          'QA_PRAEFECT_REPOSITORY_STORAGE' => :qa_praefect_repository_storage,
+          'QA_RECORD_VIDEO' => :record_video,
+          'QA_REMOTE_GRID' => :remote_grid,
+          'QA_REMOTE_GRID_ACCESS_KEY' => :remote_grid_access_key,
+          'QA_REMOTE_GRID_PROTOCOL' => :remote_grid_protocol,
+          'QA_REMOTE_GRID_USERNAME' => :remote_grid_username,
+          'QA_REMOTE_MOBILE_DEVICE_NAME' => :remote_mobile_device_name,
+          'QA_REMOTE_TUNNEL_ID' => :remote_tunnel_id,
+          'QA_RSPEC_REPORT_PATH' => :qa_rspec_report_path,
+          'QA_SELENOID_BROWSER_IMAGE' => :selenoid_browser_image,
+          'QA_SELENOID_BROWSER_VERSION' => :selenoid_browser_version,
+          'QA_SIMULATE_SLOW_CONNECTION' => :qa_simulate_slow_connection,
+          'QA_SKIP_PULL' => :qa_skip_pull,
+          'QA_SLOW_CONNECTION_LATENCY_MS' => :qa_slow_connection_latency_ms,
+          'QA_SLOW_CONNECTION_THROUGHPUT_KBPS' => :qa_slow_connection_throughput_kbps,
+          'QA_VALIDATE_RESOURCE_REUSE' => :qa_validate_resource_reuse,
+          'QA_VIDEO_RECORDER_IMAGE' => :video_recorder_image,
+          'QA_VIDEO_RECORDER_VERSION' => :video_recorder_version,
           'QA_1P_EMAIL' => :qa_1p_email,
+          'QA_1P_GITHUB_UUID' => :qa_1p_github_uuid,
           'QA_1P_PASSWORD' => :qa_1p_password,
           'QA_1P_SECRET' => :qa_1p_secret,
-          'QA_1P_GITHUB_UUID' => :qa_1p_github_uuid,
           'RELEASE' => :release,
+          'RELEASE_REGISTRY_PASSWORD' => :release_registry_password,
           'RELEASE_REGISTRY_URL' => :release_registry_url,
           'RELEASE_REGISTRY_USERNAME' => :release_registry_username,
-          'RELEASE_REGISTRY_PASSWORD' => :release_registry_password,
+          'RSPEC_FAST_QUARANTINE_PATH' => :rspec_fast_quarantine_path,
+          'RSPEC_SKIPPED_TESTS_REPORT_PATH' => :skipped_tests_report_path,
+          'SCHEDULE_TYPE' => :schedule_type,
           'SELENOID_DIRECTORY' => :selenoid_directory,
+          'SIGNUP_DISABLED' => :signup_disabled,
+          'SIMPLE_SAML_FINGERPRINT' => :simple_saml_fingerprint,
+          'SIMPLE_SAML_HOSTNAME' => :simple_saml_hostname,
+          'SMOKE_ONLY' => :smoke_only,
+          'TOP_UPSTREAM_MERGE_REQUEST_IID' => :top_upstream_merge_request_iid,
           'USE_SELENOID' => :use_selenoid,
-          'SCHEDULE_TYPE' => :schedule_type,
+          'WEBDRIVER_HEADLESS' => :webdriver_headless,
+          'WORKSPACES_DOMAIN_CERT' => { name: :workspaces_domain_cert, type: :file },
+          'WORKSPACES_DOMAIN_KEY' => { name: :workspaces_domain_key, type: :file },
           'WORKSPACES_OAUTH_APP_ID' => :workspaces_oauth_app_id,
           'WORKSPACES_OAUTH_APP_SECRET' => :workspaces_oauth_app_secret,
           'WORKSPACES_OAUTH_SIGNING_KEY' => :workspaces_oauth_signing_key,
           'WORKSPACES_PROXY_DOMAIN' => :workspaces_proxy_domain,
-          'WORKSPACES_DOMAIN_CERT' => { name: :workspaces_domain_cert, type: :file },
-          'WORKSPACES_DOMAIN_KEY' => { name: :workspaces_domain_key, type: :file },
           'WORKSPACES_WILDCARD_CERT' => { name: :workspaces_wildcard_cert, type: :file },
-          'WORKSPACES_WILDCARD_KEY' => { name: :workspaces_wildcard_key, type: :file }
+          'WORKSPACES_WILDCARD_KEY' => { name: :workspaces_wildcard_key, type: :file },
+          'EPIC_SYNC_TEST' => :epic_sync_test
         }.freeze
         def variables
@@ -392,9 +392,7 @@ module Gitlab
           live_envs = %w[staging staging-canary staging-ref canary preprod production]
           return unless live_envs.include?(ci_project_name)
-          test_subset = if env_var_value_if_defined('NO_ADMIN') == 'true'
-                          'sanity-no-admin'
-                        elsif env_var_value_if_defined('SMOKE_ONLY') == 'true'
+          test_subset = if env_var_value_if_defined('SMOKE_ONLY') == 'true'
                           'sanity'
                         else
                           'full'
@@ -403,6 +401,13 @@ module Gitlab
           "#{ci_project_name}-#{test_subset}"
         end
+        # The default network for the Docker containers
+        #
+        # @example <component>.test
+        def docker_network
+          env_var_value_if_defined('QA_DOCKER_NETWORK') || 'test'
+        end
         def docker_add_hosts
           (env_var_value_if_defined('QA_DOCKER_ADD_HOSTS') || '').split(',')
         end

data/lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb CHANGED Viewed

@@ -21,7 +21,7 @@ module Gitlab
           end
           def prepare
-            minio.network = 'test'
+            minio.network = Runtime::Env.docker_network
             TYPES.each do |bucket_name|
               minio.add_bucket("#{bucket_name}-bucket")

data/lib/gitlab/qa/scenario/test/instance/airgapped.rb CHANGED Viewed

@@ -13,7 +13,7 @@ module Gitlab
               # Uses https://docs.docker.com/engine/reference/commandline/network_create/#network-internal-mode
               @airgapped_network_name = 'airgapped'
               # Uses iptables to deny all network traffic, with a number of exceptions for required ports and IPs
-              @iptables_restricted_network = 'test'
+              @iptables_restricted_network = Runtime::Env.docker_network
               @config = Component::GitalyCluster::GitalyClusterConfig.new(
                 gitlab_name: "gitlab-airgapped-#{SecureRandom.hex(4)}",
                 airgapped_network: true,

data/lib/gitlab/qa/scenario/test/instance/image.rb CHANGED Viewed

@@ -17,7 +17,7 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.volumes = @volumes
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = Runtime::Env.qa_gitlab_hostname
                 gitlab.seed_admin_token = @seed_admin_token
                 gitlab.tls = Runtime::Env.qa_gitlab_use_tls?

data/lib/gitlab/qa/scenario/test/instance/relative_url.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.relative_path = '/relative'
                 gitlab.omnibus_configuration << "external_url '#{gitlab.address}'"

data/lib/gitlab/qa/scenario/test/instance/repository_storage.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
                 gitlab.name = 'gitlab'
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.omnibus_configuration << gitlab_omnibus_configuration
                 cluster = Component::GitalyCluster.perform do |c|
                   c.config = Component::GitalyCluster::GitalyClusterConfig.new(gitlab_name: 'gitlab')

data/lib/gitlab/qa/scenario/test/integration/ai_gateway_base.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Gitlab
             SETUP_DEST_PATH = '/tmp/setup-scripts'
             def initialize
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @ai_gateway_name = 'ai-gateway'
               @ai_gateway_hostname = "#{@ai_gateway_name}.#{@network}"
               @ai_gateway_port = 5000
@@ -42,6 +42,7 @@ module Gitlab
               gitlab.network = @network
               gitlab.omnibus_gitlab_rails_env['AI_GATEWAY_URL'] = "http://#{@ai_gateway_hostname}:#{@ai_gateway_port}"
+              gitlab.omnibus_gitlab_rails_env['LLM_DEBUG'] = 'true'
               gitlab.set_ee_activation_code if @use_cloud_license
             end

data/lib/gitlab/qa/scenario/test/integration/client_ssl.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Gitlab
             def initialize
               @gitlab_name = 'gitlab'
               @spec_suite = 'Test::Instance::All'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @env = {}
               @tag = 'client_ssl'
             end

data/lib/gitlab/qa/scenario/test/integration/elasticsearch.rb CHANGED Viewed

@@ -26,7 +26,7 @@ module Gitlab
                 setup_elasticsearch_on gitlab
                 Component::Elasticsearch.perform do |elastic|
-                  elastic.network = 'test'
+                  elastic.network = Runtime::Env.docker_network
                   elastic.instance do
                     gitlab.instance do
                       Runtime::Logger.info("Running #{spec_suite} specs!")
@@ -49,7 +49,7 @@ module Gitlab
             def setup_elasticsearch_on(instance)
               instance.name = gitlab_name
-              instance.network = 'test'
+              instance.network = Runtime::Env.docker_network
               instance.elastic_url = 'http://elastic68:9200'
               instance.exec_commands = empty_index
             end

data/lib/gitlab/qa/scenario/test/integration/gitlab_pages.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module Gitlab
           class GitlabPages < Scenario::Template
             def initialize
               @gitlab_name = 'gitlab-pages'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @pages_host = 'gitlab-pages.test'
               @pages_sandbox_name = 'gitlab-qa-sandbox-group-pages'
               @tag = 'gitlab_pages'

data/lib/gitlab/qa/scenario/test/integration/import.rb CHANGED Viewed

@@ -14,7 +14,7 @@ module Gitlab
           #
           class Import < Scenario::Template
             def initialize
-              @network = "test"
+              @network = Runtime::Env.docker_network
               @source_gitlab = Component::Gitlab.new.tap { |gitlab| gitlab.network = @network }
               @target_gitlab = Component::Gitlab.new.tap { |gitlab| gitlab.network = @network }
               @mock_server = Component::MockServer.new.tap do |server|

data/lib/gitlab/qa/scenario/test/integration/integrations.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab-integrations'
                 gitlab.instance do
                   Component::Specs.perform do |specs|

data/lib/gitlab/qa/scenario/test/integration/jira.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab-jira'
                 Component::Jira.perform do |jira|

data/lib/gitlab/qa/scenario/test/integration/ldap.rb CHANGED Viewed

@@ -21,7 +21,7 @@ module Gitlab
             def initialize
               @ldap_name = 'ldap-server'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
             end
             def configure_omnibus(gitlab)
@@ -69,7 +69,7 @@ module Gitlab
             def orchestrate_ldap(&block)
               Component::LDAP.perform do |ldap|
                 ldap.name = 'ldap-server'
-                ldap.network = 'test'
+                ldap.network = Runtime::Env.docker_network
                 ldap.set_gitlab_credentials
                 ldap.tls = tls
@@ -81,7 +81,7 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.name = gitlab_name
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.tls = tls
                 configure_omnibus(gitlab)

data/lib/gitlab/qa/scenario/test/integration/mattermost.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 mattermost_hostname = "mattermost.#{gitlab.network}"
                 mattermost_external_url = "http://#{mattermost_hostname}"

data/lib/gitlab/qa/scenario/test/integration/metrics.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab'
                 gitlab.ports = [PUMA_METRICS_SERVER_PORT, SIDEKIQ_METRICS_SERVER_PORT]

data/lib/gitlab/qa/scenario/test/integration/mtls.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Gitlab
               @gitlab_name = 'gitlab'
               @gitaly_name = 'gitaly'
               @spec_suite = 'Test::Instance::All'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @env = {}
               @tag = 'mtls'
             end

data/lib/gitlab/qa/scenario/test/integration/opensearch.rb CHANGED Viewed

@@ -27,7 +27,7 @@ module Gitlab
                 setup_opensearch_on gitlab
                 Component::Opensearch.perform do |opensearch|
-                  opensearch.network = 'test'
+                  opensearch.network = Runtime::Env.docker_network
                   opensearch.instance do
                     gitlab.instance do
                       Runtime::Logger.info("Running #{spec_suite} specs!")
@@ -50,7 +50,7 @@ module Gitlab
             def setup_opensearch_on(instance)
               instance.name = gitlab_name
-              instance.network = 'test'
+              instance.network = Runtime::Env.docker_network
               instance.elastic_url = "http://elastic68:9200"
               instance.exec_commands = empty_index
             end

data/lib/gitlab/qa/scenario/test/integration/registry.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab'
                 gitlab.omnibus_configuration << <<~OMNIBUS

data/lib/gitlab/qa/scenario/test/integration/registry_tls.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab'
                 gitlab.tls = true

data/lib/gitlab/qa/scenario/test/integration/registry_with_cdn.rb CHANGED Viewed

@@ -11,9 +11,9 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab'
-                gitlab.seed_admin_token = false
+                gitlab.seed_admin_token = true
                 sign_url_key_path = gitlab.create_key_file('GOOGLE_CDN_SIGNURL_KEY')
                 cdn_gcloud_path = gitlab.create_key_file('GOOGLE_CDN_JSON_KEY')

data/lib/gitlab/qa/scenario/test/integration/saml.rb CHANGED Viewed

@@ -18,19 +18,19 @@ module Gitlab
               # no-op
             end
-            def perform(release, *rspec_args)
+            def perform(release, *rspec_args) # rubocop:disable Metrics/AbcSize
               release = QA::Release.new(release)
               before_perform(release)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = gitlab_name
                 gitlab.set_accept_insecure_certs
                 if saml_component
                   Component::SAML.perform do |saml|
-                    saml.network = 'test'
+                    saml.network = Runtime::Env.docker_network
                     configure(gitlab, saml)
                     saml.instance do

data/lib/gitlab/qa/scenario/test/integration/service_ping_disabled.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.omnibus_configuration << <<~OMNIBUS
                   gitlab_rails['usage_ping_enabled'] = false;

data/lib/gitlab/qa/scenario/test/integration/smtp.rb CHANGED Viewed

@@ -28,7 +28,7 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = gitlab_name
                 Component::MailHog.perform do |mail_hog|

data/lib/gitlab/qa/scenario/test/integration/suggested_reviewer.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Gitlab
             def initialize
               @spec_suite = 'Test::Instance::All'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @env = {}
               @tag = 'suggested_reviewer'
               @gitlab_name = 'gitlab-suggested-reviewer'

data/lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb CHANGED Viewed

@@ -79,7 +79,7 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.volumes = volumes
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 if skip_setup
                   gitlab.skip_server_hooks = true

data/lib/gitlab/qa/support/gitlab_upgrade_path.rb CHANGED Viewed

@@ -82,9 +82,9 @@ module Gitlab
         # @return [String]
         def upgrade_path_yml
           @upgrade_path_yml ||= begin
-            logger.info("Fetching gitlab upgrade path from 'gitlab-com/support/toolbox/upgrade-path' project")
+            logger.info("Fetching gitlab upgrade path from 'gitlab.com/gitlab-org/gitlab' project")
             HttpRequest.make_http_request(
-              url: "https://gitlab.com/gitlab-com/support/toolbox/upgrade-path/-/raw/main/upgrade-path.yml"
+              url: "https://gitlab.com/gitlab-org/gitlab/-/raw/master/config/upgrade_path.yml"
             ).body
           end
         end

data/lib/gitlab/qa/version.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 module Gitlab
   module QA
-    VERSION = '14.10.0'
+    VERSION = '14.11.0'
   end
 end

data/rubocop/cop/gitlab/dangerous_interpolation.rb CHANGED Viewed

@@ -119,7 +119,6 @@ module RuboCop
           'GCS_CDN_BUCKET_NAME' => :gcs_cdn_bucket_name,
           'GCS_BUCKET_NAME' => :gcs_bucket_name,
           'SMOKE_ONLY' => :smoke_only,
-          'NO_ADMIN' => :no_admin,
           'CHROME_DISABLE_DEV_SHM' => :chrome_disable_dev_shm,
           'COLORIZED_LOGS' => :colorized_logs,
           'FIPS' => :fips,

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.10.0
+  version: 14.11.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-12 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -409,7 +409,6 @@ files:
 - lib/gitlab/qa/component/staging.rb
 - lib/gitlab/qa/component/staging_ref.rb
 - lib/gitlab/qa/component/suggested_reviewer.rb
-- lib/gitlab/qa/component/telegraf.rb
 - lib/gitlab/qa/docker/command.rb
 - lib/gitlab/qa/docker/engine.rb
 - lib/gitlab/qa/docker/volumes.rb
@@ -442,7 +441,6 @@ files:
 - lib/gitlab/qa/scenario/test/instance/repository_storage.rb
 - lib/gitlab/qa/scenario/test/instance/smoke.rb
 - lib/gitlab/qa/scenario/test/instance/staging.rb
-- lib/gitlab/qa/scenario/test/instance/staging_geo.rb
 - lib/gitlab/qa/scenario/test/instance/staging_ref.rb
 - lib/gitlab/qa/scenario/test/instance/staging_ref_geo.rb
 - lib/gitlab/qa/scenario/test/integration/ai_gateway.rb
@@ -480,7 +478,6 @@ files:
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
 - lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb
 - lib/gitlab/qa/scenario/test/omnibus/upgrade.rb
-- lib/gitlab/qa/scenario/test/sanity/version.rb
 - lib/gitlab/qa/service/cluster_provider/base.rb
 - lib/gitlab/qa/service/cluster_provider/k3d.rb
 - lib/gitlab/qa/service/kubernetes_cluster.rb

data/lib/gitlab/qa/component/telegraf.rb DELETED Viewed

@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-require 'tempfile'
-module Gitlab
-  module QA
-    module Component
-      # Component to collect docker metrics
-      #
-      class Telegraf < Base
-        DOCKER_IMAGE = 'telegraf'
-        DOCKER_IMAGE_TAG = '1.21-alpine'
-        LOG_DIR = '/etc/telegraf/log'
-        def initialize
-          super
-          @name = DOCKER_IMAGE
-          @host_log_dir = "#{Runtime::Env.host_artifacts_dir}/#{@name}"
-          @environment = Runtime::Env.variables.slice(
-            'QA_INFLUXDB_TOKEN',
-            'QA_INFLUXDB_URL',
-            'QA_RUN_TYPE',
-            'CI_JOB_NAME',
-            'CI_PIPELINE_ID'
-          )
-        end
-        attr_reader :name, :host_log_dir, :telegraf_config
-        # Start container
-        #
-        # @return [void]
-        def start
-          docker.run(image: image, tag: tag) do |command|
-            set_command_args(command)
-            set_volumes(command)
-            set_environment(command)
-          end
-        end
-        # Run prepare commands
-        #
-        # @return [void]
-        def prepare
-          @telegraf_config = File.open("#{Dir.mktmpdir(nil, ENV.fetch('CI_BUILDS_DIR', nil))}/telegraf.conf",
-            'w') do |file|
-            file.write(config)
-            file.path
-          end
-          FileUtils.mkdir_p(host_log_dir)
-          prepare_docker_image
-          prepare_docker_container
-        end
-        # Run teardown
-        #
-        # @return [void]
-        def teardown
-          return unless run_telegraf?
-          super
-        end
-        private
-        # Set custom run command arguments
-        #
-        # @param [Docker::Command] command
-        # @return [void]
-        def set_command_args(command)
-          command << '-d'
-          command << "--name #{name}"
-          command << "--user root"
-          command << "--entrypoint telegraf"
-        end
-        # Set volumes
-        #
-        # @param [Docker::Command] command
-        # @return [void]
-        def set_volumes(command)
-          command.volume(host_log_dir, LOG_DIR)
-          command.volume('/var/run/docker.sock', '/var/run/docker.sock')
-          command.volume(telegraf_config, '/etc/telegraf/telegraf.conf', :ro)
-        end
-        # Set environment variables
-        #
-        # @param [Docker::Command] command
-        # @return [void]
-        def set_environment(command)
-          environment.each { |k, v| command.env(k, v) }
-        end
-        # Run main entrypoint
-        #
-        # @return [void]
-        def instance_no_teardown
-          if run_telegraf?
-            super
-          else
-            Runtime::Logger.debug("Skipping starting telegraf container!")
-            yield self if block_given?
-          end
-        end
-        # Should telegraf be started
-        #
-        # Run only on CI and skip if metrics explicitly disabled, run_type not set or influx params missing
-        #
-        # @return [Boolean]
-        def run_telegraf?
-          Runtime::Env.ci && Runtime::Env.qa_export_test_metrics? && Runtime::Env.qa_run_type && !missing_influx_config?
-        end
-        # Influxdb config params missing
-        #
-        # @return [Boolean]
-        def missing_influx_config?
-          environment.slice('QA_INFLUXDB_TOKEN', 'QA_INFLUXDB_URL').any? { |_k, v| v.blank? }
-        end
-        # Telegraf configuration
-        #
-        # @return [String]
-        def config
-          <<~CONFIG
-            [global_tags]
-              run_type = "${QA_RUN_TYPE}"
-              pipeline_id = "${CI_PIPELINE_ID}"
-              job_name = "${CI_JOB_NAME}"
-            [agent]
-              interval = "1s"
-              round_interval = true
-              metric_batch_size = 1000
-              metric_buffer_limit = 10000
-              collection_jitter = "0s"
-              flush_interval = "10s"
-              flush_jitter = "0s"
-              precision = ""
-              debug = true
-              logtarget = "file"
-              logfile = "#{LOG_DIR}/telegraf.log"
-              hostname = ""
-              omit_hostname = false
-            [[outputs.influxdb_v2]]
-              urls = ["${QA_INFLUXDB_URL}"]
-              token = "${QA_INFLUXDB_TOKEN}"
-              organization = "gitlab-qa"
-              bucket = "test-env-stats"
-            [[inputs.docker]]
-              endpoint = "unix:///var/run/docker.sock"
-              gather_services = false
-              container_names = []
-              source_tag = false
-              container_name_include = []
-              container_name_exclude = ["#{name}"]
-              timeout = "5s"
-              perdevice = false
-              perdevice_include = []
-              total = true
-              total_include = ["cpu", "blkio", "network"]
-              docker_label_include = []
-              docker_label_exclude = []
-          CONFIG
-        end
-      end
-    end
-  end
-end

data/lib/gitlab/qa/scenario/test/instance/staging_geo.rb DELETED Viewed

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Instance
-          ##
-          # Run test suite against staging.gitlab.com
-          #
-          class StagingGeo < DeploymentBase
-            def initialize
-              @suite = 'QA::EE::Scenario::Test::Geo'
-            end
-            def deployment_component
-              Component::Staging
-            end
-            def non_rspec_args
-              [
-                '--primary-address', deployment_component::ADDRESS,
-                '--secondary-address', deployment_component::GEO_SECONDARY_ADDRESS,
-                '--without-setup'
-              ]
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/gitlab/qa/scenario/test/sanity/version.rb DELETED Viewed

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-require 'json'
-require 'net/http'
-require 'cgi'
-require 'time'
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Sanity
-          # This test checks that the sha_version of a GitLab was authored in
-          # the window defined by the `weekday_hours` method.
-          # We perform a single API call to get the commit
-          class Version < Scenario::Template
-            SOURCE_MAP = {
-              'git@dev.gitlab.org:gitlab/gitlab-ee.git' => {
-                host: 'dev.gitlab.org',
-                project: 'gitlab/gitlab-ee'
-              },
-              'git@dev.gitlab.org:gitlab/gitlabhq.git' => {
-                host: 'dev.gitlab.org',
-                project: 'gitlab/gitlabhq'
-              },
-              'git@gitlab.com:gitlab-org/gitlab.git' => {
-                host: 'gitlab.com',
-                project: 'gitlab-org/gitlab'
-              },
-              'git@gitlab.com:gitlab-org/gitlab-foss.git' => {
-                host: 'gitlab.com',
-                project: 'gitlab-org/gitlab-foss'
-              }
-            }.freeze
-            def perform(release = 'ce')
-              version = Component::Gitlab.perform do |gitlab|
-                gitlab.release = release
-                gitlab.act do
-                  pull
-                  rails_version
-                end
-              end
-              project = SOURCE_MAP[version[:source]][:project]
-              host = SOURCE_MAP[version[:source]][:host]
-              sha = version[:sha]
-              commit = api_commit_detail(host, project, sha)
-              if commit_within_hours?(commit['created_at'], weekday_hours(commit['created_at']))
-                puts "Found commit #{sha} in recent history of #{project} on #{host}"
-              else
-                puts "Did not find #{sha} in recent history of #{project} on #{host}"
-                exit 1
-              end
-            end
-            private
-            def weekday_hours(date_string)
-              case Date.parse(date_string).wday
-                # Sunday
-              when 0
-                48
-                # Monday
-              when 1
-                72
-              else
-                24
-              end
-            end
-            def commit_within_hours?(commit_time_string, hours)
-              Time.at(Time.parse(commit_time_string).utc).to_datetime > Time.at((Time.now - (hours * 60 * 60)).utc).to_datetime
-            end
-            def api_commit_detail(host, project, sha)
-              url = "https://#{host}/api/v4/projects/#{CGI.escape(project)}/repository/commits/#{sha}"
-              if host == 'dev.gitlab.org'
-                Runtime::Env.require_qa_dev_access_token!
-                url = "#{url}?private_token=#{Runtime::Env.qa_dev_access_token}"
-              end
-              JSON.parse(Net::HTTP.get(URI(url)))
-            end
-          end
-        end
-      end
-    end
-  end
-end