gitlab-qa 10.4.1 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d05691dfdac6eb77440c9440dc824c50fdb6e68530c23d53d1480eab92b17316
-  data.tar.gz: b76dbe09cea7fd9ca5092eaa024d0d9f69b33f35362f741145c4b576d486bf46
+  metadata.gz: 8096dd0f8bbb920768cdba226589b8fff443c277c03795ebdb7281b1fa0b243e
+  data.tar.gz: 376b71befea84be9b722cc53e8f3929382781fd5c47b1a29c7f5540117417fb0
 SHA512:
-  metadata.gz: bec6faa9d2f322f523ddd75ccf29497fadbb723a04ad4b545e7bb0a277e9e6e430b586eb2d21d3371326e6c7b1c1257dfc497da0e72f4cf1c27de9ff4705e5f8
-  data.tar.gz: bef3adb4164e0c9b9e756358cea2dbbf9b1802ea7410764291a109999540a151e666cd7ff84799ef0e2c91cc1a169ca2ea6b2871e732784c67e0eeaefd27037d
+  metadata.gz: 8ebb0fc14b72801c83a462b08cbea11f05fffa6366dd8ddbc07838d31d052f65bad914b88acecec1d2528981188603da215712894f4c0c8f2f71b932fe206dfa
+  data.tar.gz: f707dc6915ac54490314c5ef89805bcde649990cbbfff9151360a3341d30c3820034c65afdaecaf52df58cf986c00005b5974fb526a4dfaebb6f9c6e81bb9b36

data/.gitlab/changelog_config.yml

@@ -0,0 +1,13 @@
+---
+# Settings for generating changelogs using the GitLab API. See
+# https://docs.gitlab.com/ee/api/repositories.html#generate-changelog-data for
+# more information.
+categories:
+  added: Added
+  fixed: Fixed
+  changed: Changed
+  deprecated: Deprecated
+  removed: Removed
+  security: Security
+  performance: Performance
+  other: Other

data/.gitlab/merge_request_templates/Release.md

@@ -1,40 +1,13 @@
-<!-- Replace `v4.5.0` with the previous release here, and `e18d76b309e42888759c1effe96767f13e34ae55`
-with the latest commit from https://gitlab.com/gitlab-org/gitlab-qa/commits/master that will be included in the release. -->
-- Diff: https://gitlab.com/gitlab-org/gitlab-qa/compare/v4.5.0...e18d76b309e42888759c1effe96767f13e34ae55
+<!-- Replace `<PREVIOUS_VERSION>` with the previous version number here, `<COMMIT_UPDATING_VERSION>` with the latest
+commit from this merge request, and `<NEW_VERSION>` with the upcoming version number. -->
+## Diff
 
-- Release notes:
+https://gitlab.com/gitlab-org/gitlab-qa/-/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
 
-<!-- Keep the sections order but remove the empty sections -->
+## Checklist
 
-```markdown
-### New scenarios and scenario updates
+- [ ] Diff link is up-to-date.
+- [ ] Check the release notes: https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-qa/repository/changelog?version=<NEW_VERSION>
+- [ ] Based on the diff and the release notes, `version.rb` is updated, according to [SemVer](https://semver.org).
 
-- !aaa <Title of the aaa MR>.
-
-### Fixes
-
-- !bbb <Title of the bbb MR>.
-
-### Doc changes
-
-- !ccc <Title of the ccc MR>.
-
-### Other changes (CI, backstage)
-
-- !ddd <Title of the ddd MR>.
-```
-
-- Checklist before merging:
-  - [ ] Diff link is up-to-date.
-  - [ ] Based on the diff, `lib/gitlab/qa/version.rb` is updated, according to [SemVer](https://semver.org).
-  - [ ] Release notes are accurate.
-
-- Checklist after merging:
-  - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
-
-- Checklist after gitlab-qa version has been released by the post merge pipeline:
-  - [ ] In the pipeline-common project, [update the GITLAB_QA_VERSION](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/base.gitlab-ci.yml) and [create a release](https://gitlab.com/gitlab-org/quality/pipeline-common#release-process).
-  - [ ] In the GitLab project, update the ref for pipeline-common in [qa-common](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/qa-common/main.gitlab-ci.yml) and [review-apps](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/review-apps/qa.gitlab-ci.yml).
-  - [ ] Unless already done by [renovate-gitlab-bot](https://gitlab.com/dashboard/merge_requests?scope=all&state=opened&author_username=gitlab-dependency-update-bot&label_name[]=Quality), or if you need it sooner, in the GitLab project, [update the gitlab-qa gem version](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/Gemfile) and [`Gemfile.lock`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/Gemfile.lock) (for an example, see: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117054).
-
-/label ~Quality ~"type::maintenance" ~"maintenance::dependency"
+/label ~Quality ~"type::maintenance" ~"maintenance::dependency" ~Quality

data/.rubocop_todo.yml

@@ -33,8 +33,6 @@ Lint/ConstantDefinitionInBlock:
 Lint/MixedRegexpCaptureTypes:
   Exclude:
     - 'lib/gitlab/qa/release.rb'
-    - 'lib/gitlab/qa/report/relate_failure_issue.rb'
-    - 'lib/gitlab/qa/report/update_screenshot_path.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -110,22 +108,12 @@ Style/MutableConstant:
     - 'db/post_migrate/**/*'
     - 'db/geo/migrate/**/*'
     - 'lib/gitlab/qa/release.rb'
-    - 'lib/gitlab/qa/report/update_screenshot_path.rb'
 
 # Offense count: 9
 # Cop supports --auto-correct.
 Style/RedundantRegexpEscape:
   Exclude:
     - 'lib/gitlab/qa/release.rb'
-    - 'lib/gitlab/qa/report/generate_test_session.rb'
-    - 'lib/gitlab/qa/report/relate_failure_issue.rb'
-    - 'lib/gitlab/qa/report/update_screenshot_path.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/gitlab/qa/reporter.rb'
 
 # Offense count: 191
 # Cop supports --auto-correct.

data/Dangerfile

@@ -2,8 +2,4 @@
 
 require 'gitlab-dangerfiles'
 
-Gitlab::Dangerfiles.for_project(self) do |dangerfiles|
-  dangerfiles.import_plugins
-
-  dangerfiles.import_dangerfiles(except: %w[changelog])
-end
+Gitlab::Dangerfiles.for_project(self, &:import_defaults)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (10.4.1)
+    gitlab-qa (11.1.0)
       activesupport (~> 6.1)
-      gitlab (~> 4.18.0)
+      gitlab (~> 4.19)
       http (~> 5.0)
       nokogiri (~> 1.10)
       parallel (>= 1, < 2)
@@ -91,8 +91,8 @@ GEM
     git (1.12.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitlab (4.18.0)
-      httparty (~> 0.18)
+    gitlab (4.19.0)
+      httparty (~> 0.20)
       terminal-table (>= 1.5.1)
     gitlab-dangerfiles (2.11.0)
       danger (>= 8.4.5)

data/README.md

@@ -96,8 +96,7 @@ of tests.
 ## How do we use it
 
 Currently, we execute the test suite against GitLab Docker images created by
-Omnibus nightly via a pipeline in the [nightly](https://gitlab.com/gitlab-org/quality/nightly)
-project.
+Omnibus nightly via a [`gitlab-org/gitlab` nightly schedule pipeline](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules).
 
 We also execute the test suite nightly against our [staging environment](https://staging.gitlab.com)
 via a pipeline in the [staging project](https://gitlab.com/gitlab-org/quality/staging).

data/docs/running_against_remote_grid.md

@@ -8,19 +8,56 @@ I.e, if you have a Selenium server set up at http://localhost:4444 or if you hav
 
 | Variable                  | Description                                                    | Default  | Example(s)                     |
 |---------------------------|----------------------------------------------------------------|----------|--------------------------------|
-| QA_BROWSER                | Browser to run against                                         | "chrome" | "chrome" "firefox" "safari"    |
-| QA_BROWSER_VERSION        | Version of browser to run against                              | "latest" | "latest" "111.0" "mobile-111.0"|
+| QA_BROWSER                | Browser to run against                                         | "chrome" | "chrome" "edge"                |
+| QA_BROWSER_VERSION        | Version of browser to run against                              | "111.0"  | "latest" "111.0" "mobile-111.0"|
 | QA_REMOTE_GRID_PROTOCOL   | Protocol to use                                                | "http"   | "http" "https"                 |
 | QA_REMOTE_GRID            | Remote grid to run tests against                               |          | "localhost:3000" "provider:80" "selenoid:4444" |
 | QA_LAYOUT                 | Used with Selenoid. Tells test nav to expect collapsed menus. "phone" expects collapsed top and left nav bars, "tablet" expects collapsed left nav bar only. |          | "phone", "tablet"              |
 | SELENOID_DIRECTORY        | Used with Selenoid. Directory to save videos to                | "<host_artifacts_dir>/selenoid" |        |
 | USE_SELENOID              | Used with Selenoid. Sets up selenoid containers.               | false    | false, true                    |
 | QA_RECORD_VIDEO           | Used with Selenoid. Triggers video recording.                  | false    | false, true                    |
+| QA_BROWSER_IMAGE          | Used with Selenoid. Sets the browser image to use for video recording. | "selenoid/chrome" | "selenoid/chrome", "registry.gitlab.com/gitlab-org/gitlab-qa/selenoid-chrome-gitlab" |
+| QA_VIDEO_RECORDER_IMAGE   | Used with Selenoid. Sets the video recorder image to use for video recording. | "presidenten/selenoid-manual-video-recorder" | "presidenten/selenoid-manual-video-recorder" |
+| QA_VIDEO_RECORDER_VERSION | Used with Selenoid. Sets the video recorder image version to use for video recording. | "latest" | "latest"                     |
+| QA_RECORD_VIDEO           | Used with Selenoid. Triggers video recording.                  | false    | false, true                    |
 | QA_REMOTE_GRID_USERNAME   | Used with Sauce Labs. Username to specify in the remote grid. "USERNAME@provider:80" |          | "gitlab-sl"                    |
 | QA_REMOTE_GRID_ACCESS_KEY | Used with Sauce Labs. Key/Token paired with `QA_REMOTE_GRID_USERNAME` |          |                                |
 | QA_REMOTE_TUNNEL_ID       | Used with Sauce Labs. Name of the remote tunnel to use         | "gitlab-sl_tunnel_id" |                                |
 | QA_REMOTE_MOBILE_DEVICE_NAME | Used with Sauce Labs. Name of mobile device to test against. `QA_BROWSER` must be set to `safari` for iOS devices and `chrome` for Android devices. |          | "iPhone 12 Simulator"          |
 
+## Testing with Selenoid
+
+Running directly against an environment like staging is not recommended because test videos can expose credentials. Therefore, it is best practice to not run against live environments.
+
+Available browsers are defined in [browsers.json](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/fixtures/selenoid/browsers.json)
+
+Failure videos are available as job artifacts in the selenoid directory.
+
+### Add failure video recording to a pipeline for a non-live environment
+
+Set these environment variables:
+
+USE_SELENOID=true
+QA_RECORD_VIDEO=true
+QA_REMOTE_GRID="selenoid:4444"
+
+#### To test with an Edge browser instead of Chrome
+
+Include these environment variables:
+
+QA_BROWSER="edge"
+QA_BROWSER_IMAGE="selenoid/edge"
+
+#### To test with a Chrome mobile device browser
+
+Include these environment variables:
+
+QA_LAYOUT="phone"
+QA_BROWSER_IMAGE="registry.gitlab.com/gitlab-org/gitlab-qa/selenoid-chrome-gitlab"
+QA_BROWSER_VERSION=mobile-111.0
+
+For now we only have version 111.0 available for chrome mobile browser testing.
+
 ## Testing with Sauce Labs
 
 Running directly against an environment like staging is not recommended because test logs expose credentials. Therefore, it is best practice and the default to use a tunnel.

data/gitlab-qa.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '3.7.0'
 
   spec.add_runtime_dependency 'activesupport', '~> 6.1'
-  spec.add_runtime_dependency 'gitlab', '~> 4.18.0'
+  spec.add_runtime_dependency 'gitlab', '~> 4.19'
   spec.add_runtime_dependency 'http', '~> 5.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
   spec.add_runtime_dependency 'parallel', '>= 1', '< 2'

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

@@ -135,7 +135,6 @@ module Gitlab
             postgresql['enable'] = false;
             redis['enable'] = false;
             nginx['enable'] = false;
-            grafana['enable'] = false;
             puma['enable'] = false;
             sidekiq['enable'] = false;
             gitlab_workhorse['enable'] = false;

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

@@ -235,17 +235,18 @@ module Gitlab
           manifest['software']['package-scripts']['locked_version']
         end
 
-        def copy_key_file(env_key)
-          key_dir = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
-          key_file = Tempfile.new(env_key.downcase, key_dir)
-          key_file.write(ENV.fetch(env_key))
-          key_file.close
+        def create_key_file(env_key)
+          key_file = Tempfile.create(env_key.downcase, ENV['CI_PROJECT_DIR'] || Dir.tmpdir).then do |file|
+            file.write(ENV.fetch(env_key))
+            file.fsync
+            file.close
 
-          File.chmod(0o744, key_file.path)
-
-          @volumes[key_file.path] = key_file.path
+            file.path
+          end
+          File.chmod(0o744, key_file)
+          @volumes[key_file] = key_file
 
-          key_file.path
+          key_file
         end
 
         private

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

@@ -27,7 +27,12 @@ module Gitlab
 
         def start
           pull_images
-          docker.run(image: image, tag: tag, args: ['-container-network', network]) do |command|
+          docker.run(image: image, tag: tag, args:
+                      ['-video-recorder-image',
+                       QA::Runtime::Env.video_recorder_image,
+                       '-container-network',
+                       network]
+                    ) do |command|
             set_command_args(command)
             set_volumes(command)
           end
@@ -55,8 +60,8 @@ module Gitlab
         end
 
         def pull_images
-          docker.pull(image: "selenoid/chrome", tag: Runtime::Env.browser_version) if Runtime::Env.browser == 'chrome' && !Runtime::Env.mobile_layout?
-          docker.pull(image: "selenoid/video-recorder", tag: "latest-release") if Runtime::Env.record_video
+          docker.pull(image: QA::Runtime::Env.browser_image, tag: Runtime::Env.browser_version)
+          docker.pull(image: QA::Runtime::Env.video_recorder_image, tag: QA::Runtime::Env.video_recorder_version)
         end
 
         # Set custom run command arguments

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

@@ -25,12 +25,14 @@ module Gitlab
           'QA_BROWSER_VERSION' => :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_BROWSER_IMAGE' => :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_DEFAULT_BRANCH' => :qa_default_branch,
           '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,
@@ -45,7 +47,6 @@ module Gitlab
           'QA_SKIP_PULL' => :qa_skip_pull,
           'QA_VALIDATE_RESOURCE_REUSE' => :qa_validate_resource_reuse,
           'WEBDRIVER_HEADLESS' => :webdriver_headless,
-          'GITLAB_API_BASE' => :api_base,
           'GITLAB_ADMIN_USERNAME' => :admin_username,
           'GITLAB_ADMIN_PASSWORD' => :admin_password,
           'GITLAB_USERNAME' => :user_username,
@@ -60,7 +61,6 @@ module Gitlab
           '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,
-          'GITLAB_QA_ISSUE_URL' => :qa_issue_url,
           'GITHUB_ACCESS_TOKEN' => :github_access_token,
           'GITLAB_URL' => :gitlab_url,
           'SIMPLE_SAML_HOSTNAME' => :simple_saml_hostname,
@@ -72,7 +72,6 @@ module Gitlab
           'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
           'GCLOUD_REGION' => :gcloud_region,
           'SIGNUP_DISABLED' => :signup_disabled,
-          'GITLAB_CI_API_TOKEN' => :gitlab_ci_api_token,
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
           'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
           'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
@@ -86,7 +85,6 @@ module Gitlab
           'QA_KNAPSACK_REPORT_GCS_CREDENTIALS' => :qa_knapsack_report_gcs_credentials,
           'QA_KNAPSACK_REPORT_PATH' => :qa_knapsack_report_path,
           'CI' => :ci,
-          'CI_COMMIT_REF_NAME' => :ci_commit_ref_name,
           'CI_JOB_NAME' => :ci_job_name,
           'CI_JOB_URL' => :ci_job_url,
           'CI_JOB_TOKEN' => :ci_job_token,
@@ -95,22 +93,16 @@ module Gitlab
           'CI_SERVER_PERSONAL_ACCESS_TOKEN' => :ci_server_personal_access_token,
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
-          'CI_PROJECT_ID' => :ci_project_id,
           'CI_PROJECT_NAME' => :ci_project_name,
           'CI_PROJECT_PATH' => :ci_project_path,
-          'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
-          'CI_PIPELINE_ID' => :ci_pipeline_id,
           'CI_PIPELINE_SOURCE' => :ci_pipeline_source,
           'CI_PIPELINE_URL' => :ci_pipeline_url,
           'CI_PIPELINE_CREATED_AT' => :ci_pipeline_created_at,
           'CI_MERGE_REQUEST_IID' => :ci_merge_request_iid,
-          'CI_API_V4_URL' => :ci_api_v4_url,
           'GITLAB_CI' => :gitlab_ci,
           'ELASTIC_URL' => :elastic_url,
           'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
           'MAILHOG_HOSTNAME' => :mailhog_hostname,
-          'SLACK_QA_CHANNEL' => :slack_qa_channel,
-          'SLACK_ICON_EMOJI' => :slack_icon_emoji,
           '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,
@@ -118,7 +110,6 @@ module Gitlab
           'JIRA_ADMIN_USERNAME' => :jira_admin_username,
           'JIRA_ADMIN_PASSWORD' => :jira_admin_password,
           'CACHE_NAMESPACE_NAME' => :cache_namespace_name,
-          'DEPLOY_VERSION' => :deploy_version,
           'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
           'GEO_FAILOVER' => :geo_failover,
           'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password,
@@ -154,7 +145,8 @@ module Gitlab
           'RELEASE_REGISTRY_USERNAME' => :release_registry_username,
           'RELEASE_REGISTRY_PASSWORD' => :release_registry_password,
           'SELENOID_DIRECTORY' => :selenoid_directory,
-          'USE_SELENOID' => :use_selenoid
+          'USE_SELENOID' => :use_selenoid,
+          'SCHEDULE_TYPE' => :schedule_type
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
@@ -196,10 +188,6 @@ module Gitlab
           env_var_value_if_defined('QA_LOG_PATH') || host_artifacts_dir
         end
 
-        def default_branch
-          env_var_value_if_defined('QA_DEFAULT_BRANCH') || 'main'
-        end
-
         def gitlab_availability_timeout
           (env_var_value_if_defined('GITLAB_QA_AVAILABILITY_TIMEOUT') || 360).to_i
         end
@@ -212,14 +200,6 @@ module Gitlab
           env_var_value_if_defined('GITLAB_DEV_USERNAME') || 'gitlab-qa-bot'
         end
 
-        def gitlab_api_base
-          env_var_value_if_defined('GITLAB_API_BASE') || 'https://gitlab.com/api/v4'
-        end
-
-        def pipeline_from_project_name
-          ci_project_name.to_s.start_with?('gitlab') ? QA::Runtime::Env.default_branch : ci_project_name
-        end
-
         def run_id
           @run_id ||= "gitlab-qa-run-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}-#{SecureRandom.hex(4)}"
         end
@@ -236,10 +216,6 @@ module Gitlab
           env_var_value_if_defined('GITLAB_INITIAL_ROOT_PASSWORD') || '5iveL!fe'
         end
 
-        def deploy_environment
-          env_var_value_if_defined('DEPLOY_ENVIRONMENT') || pipeline_from_project_name
-        end
-
         def host_artifacts_dir
           @host_artifacts_dir ||= File.join(
             env_var_value_if_defined('QA_ARTIFACTS_DIR') || '/tmp/gitlab-qa', Runtime::Env.run_id
@@ -278,18 +254,6 @@ module Gitlab
           raise ArgumentError, "Please provide GITLAB_QA_DEV_ACCESS_TOKEN"
         end
 
-        def require_slack_qa_channel!
-          return unless env_var_value_if_defined('SLACK_QA_CHANNEL').to_s.strip.empty?
-
-          raise ArgumentError, "Please provide SLACK_QA_CHANNEL"
-        end
-
-        def require_ci_slack_webhook_url!
-          return unless env_var_value_if_defined('CI_SLACK_WEBHOOK_URL').to_s.strip.empty?
-
-          raise ArgumentError, "Please provide CI_SLACK_WEBHOOK_URL"
-        end
-
         def require_qa_container_registry_access_token!
           return unless env_var_value_if_defined('GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN').to_s.strip.empty?
 
@@ -367,6 +331,22 @@ module Gitlab
           env_var_value_if_defined('QA_LAYOUT')&.match?(/tablet|phone/i)
         end
 
+        def video_recorder_image
+          env_var_value_if_defined('QA_VIDEO_RECORDER_IMAGE') || 'presidenten/selenoid-manual-video-recorder'
+        end
+
+        def video_recorder_version
+          env_var_value_if_defined('QA_VIDEO_RECORDER_VERSION') || 'latest'
+        end
+
+        def browser_image
+          env_var_value_if_defined('QA_BROWSER_IMAGE') || 'selenoid/chrome'
+        end
+
+        def browser_version
+          env_var_value_if_defined('QA_BROWSER_VERSION') || '111.0'
+        end
+
         def qa_run_type
           return env_var_value_if_defined('QA_RUN_TYPE') if env_var_value_valid?('QA_RUN_TYPE')
 

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

@@ -130,8 +130,6 @@ module Gitlab
                     ]
                   }
                 ];
-                grafana['disable_login_form'] = false;
-                grafana['admin_password'] = 'GRAFANA_ADMIN_PASSWORD';
               OMNIBUS
             end
           end

data/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb

@@ -79,8 +79,6 @@ module Gitlab
                     ]
                   }
                 ];
-                grafana['disable_login_form'] = false;
-                grafana['admin_password'] = 'GRAFANA_ADMIN_PASSWORD';
               OMNIBUS
             end
           end

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

@@ -113,7 +113,6 @@ module Gitlab
                 puma['enable'] = false;
                 sidekiq['enable'] = false;
                 gitlab_workhorse['enable'] = false;
-                grafana['enable'] = false;
                 gitlab_exporter['enable'] = false;
                 alertmanager['enable'] = false;
                 prometheus['enable'] = false;

data/lib/gitlab/qa/scenario/test/integration/praefect.rb

@@ -68,8 +68,6 @@ module Gitlab
                     ]
                   }
                 ];
-                grafana['disable_login_form'] = false;
-                grafana['admin_password'] = 'GRAFANA_ADMIN_PASSWORD';
               OMNIBUS
             end
           end

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

@@ -14,8 +14,8 @@ module Gitlab
                 gitlab.network = 'test'
                 gitlab.name = 'gitlab'
                 gitlab.seed_admin_token = false
-                sign_url_key_path = gitlab.copy_key_file('GOOGLE_CDN_SIGNURL_KEY')
-                cdn_gcloud_path = gitlab.copy_key_file('GOOGLE_CDN_JSON_KEY')
+                sign_url_key_path = gitlab.create_key_file('GOOGLE_CDN_SIGNURL_KEY')
+                cdn_gcloud_path = gitlab.create_key_file('GOOGLE_CDN_JSON_KEY')
 
                 gitlab.omnibus_configuration << <<~OMNIBUS
                   external_url 'http://#{gitlab.name}.#{gitlab.network}';

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '10.4.1'
+    VERSION = '11.1.0'
   end
 end

data/lib/gitlab/qa.rb

@@ -10,7 +10,6 @@ module Gitlab
     loader.ignore("#{__dir__}/qa/version.rb")
 
     loader.inflector.inflect(
-      'results_in_testcases' => 'ResultsInTestCases',
       'postgresql' => 'PostgreSQL',
       'registry_with_cdn' => 'RegistryWithCDN',
       'smtp' => 'SMTP',

data/support/data/admin_access_token_seed.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/numeric/time'
+
 class AdminAccessTokenSeed
   TOKEN_VALUE = 'ypCa3Dzb23o5nvsixwPA'
   SCOPES = Gitlab::Auth.all_available_scopes
@@ -9,7 +11,8 @@ class AdminAccessTokenSeed
 
     token_params = {
       scopes: SCOPES.map(&:to_s),
-      name: 'admin-api-token'
+      name: 'admin-api-token',
+      expires_at: 3.days.from_now
     }
 
     admin_user.personal_access_tokens.build(token_params).tap do |pat|