gitlab-qa 11.1.0 → 11.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8096dd0f8bbb920768cdba226589b8fff443c277c03795ebdb7281b1fa0b243e
-  data.tar.gz: 376b71befea84be9b722cc53e8f3929382781fd5c47b1a29c7f5540117417fb0
+  metadata.gz: 88c544ee8f1f83271ae1d95a95b85d48bdc8d1abda530e8c63925c151972a38d
+  data.tar.gz: 8f99edf998bf8bb342f5083f1f9bfbcd69ba64143cacf509553e0380e24acc7b
 SHA512:
-  metadata.gz: 8ebb0fc14b72801c83a462b08cbea11f05fffa6366dd8ddbc07838d31d052f65bad914b88acecec1d2528981188603da215712894f4c0c8f2f71b932fe206dfa
-  data.tar.gz: f707dc6915ac54490314c5ef89805bcde649990cbbfff9151360a3341d30c3820034c65afdaecaf52df58cf986c00005b5974fb526a4dfaebb6f9c6e81bb9b36
+  metadata.gz: 2c3ba16fb6771ba6302e074ec9d89b3b884ddaccff171f205453d82fb5aa1fb4a9b7356397f23847f9579e0c8f1e1031fc1dded51a99d86dec13595989b7d802
+  data.tar.gz: 998a6798f90d4b9c7ed7836d2ef82409b8fcd622dc92f23a914781e8eb21f428c8ad658b7111d8403a5d1718a176c750e71a69087c0c99cf558f52724b007570

data/.gitlab/merge_request_templates/Release.md

@@ -4,10 +4,16 @@ commit from this merge request, and `<NEW_VERSION>` with the upcoming version nu
 
 https://gitlab.com/gitlab-org/gitlab-qa/-/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
 
-## Checklist
+## Pre-merge checklist
 
 - [ ] 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).
 
+## Post-merge checklist
+
+- [ ] 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 [`.gitlab/ci/qa-common/main.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/qa-common/main.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 in [`qa/Gemfile`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/Gemfile) and [`qa/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" ~Quality

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (11.1.0)
+    gitlab-qa (11.3.0)
       activesupport (~> 6.1)
       gitlab (~> 4.19)
       http (~> 5.0)

data/docs/release_process.md

@@ -23,7 +23,7 @@ when we make a change - no matter the size of the change.
   - If there is one, update it if necessary.
   - If not, update [`lib/gitlab/qa/version.rb`] to an appropriate [semantic version](https://semver.org) in a new merge request using the [release template](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/.gitlab/merge_request_templates/Release.md)
     and title the MR like `"Bump version to <version>"`.
-    - Run `bundle update` to update the `Gemfile.lock` with the new version number of `gitlab-qa`.
+    - Run `bundle install` to update the `Gemfile.lock` with the new version number of `gitlab-qa`.
 - Merge the merge request.
 - The new version should automatically be tagged and pushed to Rubygems by the `gem-release` job in the merge commit pipeline.
 - Update the release notes for the newly created tag (https://gitlab.com/gitlab-org/gitlab-qa/-/tags):

data/docs/running_against_remote_grid.md

@@ -9,14 +9,14 @@ 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" "edge"                |
-| QA_BROWSER_VERSION        | Version of browser to run against                              | "111.0"  | "latest" "111.0" "mobile-111.0"|
+| QA_SELENOID_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_SELENOID_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                    |
@@ -27,7 +27,7 @@ I.e, if you have a Selenium server set up at http://localhost:4444 or if you hav
 
 ## 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.
+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. Also note that DOCKER_HOST can't be set to a non-http address.
 
 Available browsers are defined in [browsers.json](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/fixtures/selenoid/browsers.json)
 
@@ -46,15 +46,15 @@ QA_REMOTE_GRID="selenoid:4444"
 Include these environment variables:
 
 QA_BROWSER="edge"
-QA_BROWSER_IMAGE="selenoid/edge"
+QA_SELENOID_BROWSER_IMAGE="browsers/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
+QA_SELENOID_BROWSER_IMAGE="registry.gitlab.com/gitlab-org/gitlab-qa/selenoid-chrome-gitlab"
+QA_SELENOID_BROWSER_VERSION=mobile-111.0
 
 For now we only have version 111.0 available for chrome mobile browser testing.
 

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

@@ -236,17 +236,23 @@ module Gitlab
         end
 
         def create_key_file(env_key)
-          key_file = Tempfile.create(env_key.downcase, ENV['CI_PROJECT_DIR'] || Dir.tmpdir).then do |file|
+          directory = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
+          unique_filename = "#{env_key.downcase}_#{Time.now.to_i}_#{rand(100)}"
+          key_file_path = File.join(directory, unique_filename)
+
+          File.open(key_file_path, 'w') do |file|
             file.write(ENV.fetch(env_key))
             file.fsync
-            file.close
-
-            file.path
           end
-          File.chmod(0o744, key_file)
-          @volumes[key_file] = key_file
 
-          key_file
+          File.chmod(0o744, key_file_path)
+          @volumes[key_file_path] = key_file_path
+
+          key_file_path
+        end
+
+        def delete_key_file(path)
+          File.delete(path) if File.exist?(path)
         end
 
         private

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

@@ -53,14 +53,15 @@ module Gitlab
         private
 
         def grid_healthy?
-          HTTP.get('http://docker:4444/ping').status&.success?
+          host = ENV['CI'] || ENV['CI_SERVER'] ? 'docker' : 'localhost'
+          HTTP.get("http://#{host}:4444/ping").status&.success?
         rescue HTTP::ConnectionError => e
           Runtime::Logger.debug(e)
           false
         end
 
         def pull_images
-          docker.pull(image: QA::Runtime::Env.browser_image, tag: Runtime::Env.browser_version)
+          docker.pull(image: QA::Runtime::Env.selenoid_browser_image, tag: Runtime::Env.selenoid_browser_version)
           docker.pull(image: QA::Runtime::Env.video_recorder_image, tag: QA::Runtime::Env.video_recorder_version)
         end
 

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

@@ -20,11 +20,14 @@ module Gitlab
           @volumes = {}
           @additional_hosts = []
           @default_volumes = { '/var/run/docker.sock' => '/var/run/docker.sock' }
+
+          if Runtime::Env.qa_rspec_report_path.present? # rubocop:disable Style/IfUnlessModifier
+            @default_volumes[Runtime::Env.qa_rspec_report_path] = File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'rspec')
+          end
+
           return if Runtime::Env.qa_knapsack_report_path.blank?
 
-          @default_volumes[Runtime::Env.qa_knapsack_report_path] = File.join(
-            Docker::Volumes::QA_CONTAINER_WORKDIR, 'knapsack'
-          )
+          @default_volumes[Runtime::Env.qa_knapsack_report_path] = File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'knapsack')
         end
 
         def perform

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

@@ -22,12 +22,12 @@ module Gitlab
           'QA_REMOTE_MOBILE_DEVICE_NAME' => :remote_mobile_device_name,
           'QA_REMOTE_TUNNEL_ID' => :remote_tunnel_id,
           'QA_BROWSER' => :browser,
-          'QA_BROWSER_VERSION' => :browser_version,
+          '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_BROWSER_IMAGE' => :browser_image,
+          '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,
@@ -84,8 +84,12 @@ module Gitlab
           'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
           '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,
           'CI' => :ci,
           'CI_JOB_NAME' => :ci_job_name,
+          'CI_JOB_NAME_SLUG' => :ci_job_name_slug,
           'CI_JOB_URL' => :ci_job_url,
           'CI_JOB_TOKEN' => :ci_job_token,
           'CI_RUNNER_ID' => :ci_runner_id,
@@ -339,12 +343,12 @@ module Gitlab
           env_var_value_if_defined('QA_VIDEO_RECORDER_VERSION') || 'latest'
         end
 
-        def browser_image
-          env_var_value_if_defined('QA_BROWSER_IMAGE') || 'selenoid/chrome'
+        def selenoid_browser_image
+          env_var_value_if_defined('QA_SELENOID_BROWSER_IMAGE') || 'selenoid/chrome'
         end
 
-        def browser_version
-          env_var_value_if_defined('QA_BROWSER_VERSION') || '111.0'
+        def selenoid_browser_version
+          env_var_value_if_defined('QA_SELENOID_BROWSER_VERSION') || '111.0'
         end
 
         def qa_run_type

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

@@ -32,6 +32,9 @@ module Gitlab
                     specs.network = gitlab.network
                     specs.args = [gitlab.address, *rspec_args]
                   end
+                ensure
+                  gitlab.delete_key_file(sign_url_key_path)
+                  gitlab.delete_key_file(cdn_gcloud_path)
                 end
               end
             end

data/lib/gitlab/qa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 11.3.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control