gitlab-qa 10.4.1 → 10.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d05691dfdac6eb77440c9440dc824c50fdb6e68530c23d53d1480eab92b17316
-  data.tar.gz: b76dbe09cea7fd9ca5092eaa024d0d9f69b33f35362f741145c4b576d486bf46
+  metadata.gz: d20bcf2165a475147754d654e35715f0715552ea01dfcf866ed7d133f5ae9097
+  data.tar.gz: 99e4ff3dc864f8a2afee3dcdcc11ac07ffc9dfd6d344ef140356c3c5131d837b
 SHA512:
-  metadata.gz: bec6faa9d2f322f523ddd75ccf29497fadbb723a04ad4b545e7bb0a277e9e6e430b586eb2d21d3371326e6c7b1c1257dfc497da0e72f4cf1c27de9ff4705e5f8
-  data.tar.gz: bef3adb4164e0c9b9e756358cea2dbbf9b1802ea7410764291a109999540a151e666cd7ff84799ef0e2c91cc1a169ca2ea6b2871e732784c67e0eeaefd27037d
+  metadata.gz: 4d73658a3b283fb9616dd4b12469467d6851f194685350b6d07f78116f34c8db647bb5bc7226ec0a5d5e4f1f14864de94665774b0ff74ab0ea31b54a26828f82
+  data.tar.gz: e31e45cfe7a154567ac8bf5ba08522f930236d7710eda01018c9d23d607f02adcd4584455f4f59d10eb00834eae23f65b87603c8144e602f8bd569248b89c051

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/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 (10.6.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/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,6 +25,9 @@ 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,
@@ -154,7 +157,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|
@@ -367,6 +371,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 10.4.1
+  version: 10.6.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.18.0
+        version: '4.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.18.0
+        version: '4.19'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -320,6 +320,7 @@ files:
 - ".dockerignore"
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".gitlab/changelog_config.yml"
 - ".gitlab/issue_templates/Default.md"
 - ".gitlab/merge_request_templates/Default.md"
 - ".gitlab/merge_request_templates/Release.md"