gitlab-qa 14.9.0 → 14.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07bcf4d830b0b1a566f938d304e7fca8060314fe8ec2880a0203a758fc50c366
-  data.tar.gz: 9c20f4c1f1c9b234f8fcc4db0f5a38527f2ca6848585bd0f218195841f7cb090
+  metadata.gz: 0f1cb43d060925e3dd20830d8412563a94fca6fb8ad0636de7da5176b984c4e5
+  data.tar.gz: c6096e3712816f0c5667208d219f7e25ce125a869dc4c8b689e89e7c8c85242e
 SHA512:
-  metadata.gz: 00051bcdf47a11a19a2b106332acca427acf2c824b098bae1d5227927d88b50f5453e520033d3448e8ba2a914fdd04f34af931f19cc31e136c6d4a8bbcf334f8
-  data.tar.gz: deaf4242a1a8f543d2414c750e4f610b2e9c6e624b6bfea7a421b0946afab810a8b27bdd518e43fdf9be52f5946e1932d25544e942efc19ae7c64cc827b74074
+  metadata.gz: 526945385fb2c815c5cc5b7d17b7327523f099f0f08d123185041cde9142231664c62d253b96ae5262dc9519420cf79aa924750313e07af2c822c1bae528509d
+  data.tar.gz: 2782d95be4f96c1a67a1696b96bb0e8cdaa84fc0a273ac671c39925615b884c6f7e2645df4a3e95d5e74b812e82ad00af0a0a741bf4d144536764fa1d5b16a60

data/.gitlab-ci.yml

@@ -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

@@ -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

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (14.9.0)
+    gitlab-qa (14.11.0)
       activesupport (>= 6.1, < 7.2)
       gitlab (~> 4.19)
       http (~> 5.0)
@@ -175,19 +175,19 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.43.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -280,7 +280,7 @@ DEPENDENCIES
   pry (~> 0.11)
   pry-byebug (~> 3.10.1)
   rake (~> 13.0)
-  rspec (~> 3.7)
+  rspec (~> 3.13)
   simplecov (~> 0.22)
   simplecov-cobertura (~> 2.1)
   solargraph (~> 0.41)

data/docs/what_tests_can_be_run.md

@@ -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/gitlab-qa.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'pry-byebug', '~> 3.10.1'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rspec', '~> 3.13'
   spec.add_development_dependency 'simplecov', '~> 0.22'
   spec.add_development_dependency 'simplecov-cobertura', '~> 2.1'
   spec.add_development_dependency 'solargraph', '~> 0.41'

data/lib/gitlab/qa/component/base.rb

@@ -189,7 +189,7 @@ module Gitlab
           raise 'Invalid instance name!' unless name
         end
 
-        def instance_no_teardown
+        def instance_no_teardown # rubocop:disable Metrics/AbcSize
           begin
             retries ||= 0
             prepare
@@ -201,12 +201,17 @@ module Gitlab
             reconfigure_log_file = get_reconfigure_log_file_from_artefact
             # for scenarios where a service fails during startup, attempt to retry to avoid flaky failures
             if (retries += 1) < 3
-              Runtime::Logger.info(
-                "Follow the document " \
-                "https://gitlab.com/gitlab-org/quality/runbooks/-/blob/main/debug_orchestrated_test_locally/ " \
-                "for debugging the test failure locally.")
-              Runtime::Logger.error("Tailing the reconfigure log file: #{reconfigure_log_file}. Please check #{reconfigure_log_file} " \
-                                    "file in the artifacts for more details.")
+              unless reconfigure_log_file.nil?
+                Runtime::Logger.info(
+                  "Follow the document " \
+                  "https://gitlab.com/gitlab-org/quality/runbooks/-/blob/main/debug_orchestrated_test_locally/ " \
+                  "for debugging the test failure locally.")
+
+                # Tailing the reconfigure logs after retries are over and before raising exception
+                Runtime::Logger.info("Tail of the reconfigure log file, see artifacts for full log: #{reconfigure_log_file}")
+                Support::ShellCommand.new("tail -n 100 #{reconfigure_log_file}", stream_output: true).execute!
+              end
+
               Runtime::Logger.warn(
                 "Retry instance_no_teardown due to Support::ShellCommand::StatusError -- attempt #{retries}"
               )
@@ -214,9 +219,14 @@ module Gitlab
               retry
             end
 
-            # Tailing the reconfigure logs after retries are over and before raising exception
-            Runtime::Logger.info("Tail of the reconfigure log file, see artifacts for full log: #{reconfigure_log_file}")
-            Support::ShellCommand.new("tail -n 100 #{reconfigure_log_file}", stream_output: true).execute!
+            # Printing logs to stdout for last retry failure
+
+            if !reconfigure_log_file.nil? && retries == 3
+              # Tailing the reconfigure logs after retries are over and before raising exception
+              Runtime::Logger.info("Tail of the reconfigure log file, see artifacts for full log: #{reconfigure_log_file}")
+              Support::ShellCommand.new("tail -n 100 #{reconfigure_log_file}", stream_output: true).execute!
+            end
+
             raise e
           end
 

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

@@ -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.rb

@@ -67,7 +67,8 @@ module Gitlab
             gitaly['configuration'] = {
               'listen_addr': '0.0.0.0:#{gitaly_port}',
               'prometheus_listen_addr': '0.0.0.0:9236',
-              'auth_token': 'PRAEFECT_INTERNAL_TOKEN'
+              'auth_token': 'PRAEFECT_INTERNAL_TOKEN',
+              'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}}
             }
             gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
             gitlab_rails['internal_api_url'] = 'http://#{cluster_config.gitlab_name}.#{cluster_config.network}';

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

@@ -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

@@ -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

@@ -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
@@ -370,7 +370,8 @@ module Gitlab
         end
 
         def video_recorder_image
-          env_var_value_if_defined('QA_VIDEO_RECORDER_IMAGE') || 'registry.gitlab.com/gitlab-org/gitlab-qa/selenoid-manual-video-recorder'
+          env_var_value_if_defined('QA_VIDEO_RECORDER_IMAGE') ||
+            'registry.gitlab.com/gitlab-org/gitlab-qa/selenoid-manual-video-recorder'
         end
 
         def video_recorder_version
@@ -391,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'
@@ -402,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
@@ -470,6 +476,10 @@ module Gitlab
           enabled?(env_var_value_if_defined('QA_RETRY_FAILED_SPECS'), default: false)
         end
 
+        def self.qa_gitaly_transactions_enabled?
+          enabled?(env_var_value_if_defined('QA_GITALY_TRANSACTIONS_ENABLED'), default: false)
+        end
+
         private
 
         def enabled?(value, default: true)

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

@@ -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

@@ -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,
@@ -37,7 +37,7 @@ module Gitlab
                 gitlab.skip_availability_check = true
                 gitlab.omnibus_configuration << gitlab_omnibus_configuration
                 rspec_args << "--" unless rspec_args.include?('--')
-                rspec_args << %w[--tag ~orchestrated]
+                rspec_args << "--tag ~orchestrated"
                 gitlab.instance do
                   Component::Specs.perform do |specs|
                     specs.suite = 'Test::Instance::Airgapped'