gitlab-qa 10.1.0 → 10.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d71c9b26ee6da1b637bd155fc3dca98e47f739435802737110b8c76273068f
-  data.tar.gz: 4ede3accf59fadf7ba32c05cb49e0ba53eb3e9c809aa4c0978edb650e04ae529
+  metadata.gz: 6a87ce2862d1a1e65107ce6b34b35e9ffdea5dacd3ac8d193d0193ccd70955f2
+  data.tar.gz: 6b5e54d9aff03e63831b2874076ade24540c164e5391e628c0ab7b6a2a0f19b6
 SHA512:
-  metadata.gz: 70441f243143e6d241f91729d1f35ba1d1668438bbd61bfe534e616e501c989af6382606986fdf593043d2a70a7e7dd59c9d7af5ccf52f93245b29a32dcf2bb7
-  data.tar.gz: 00ecb2e2599f15295e57bfda8313b9312e780693ddc9015b344a21f25d7b0ece878789e9ee6772825617abe8ae7d262429082fe7884cc4c8e8f07ff99a5a6018
+  metadata.gz: 617455a03eba3c3e7fb55eed317084851160409105c356d76cfb7c449daa383985a62ae7a4ccac64e2804511aed8a7fe826a4bf3effac7210150c5359fa209d7
+  data.tar.gz: 9947e70d1176453db67c99223ed72c9f8be9764ffb80985fd94666d758ef5abca7b3d67b294f24988d5d089a6b1f1afc9e30ca2eed9134c944c8ccec2a1216b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (10.1.0)
+    gitlab-qa (10.2.1)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

data/docs/what_tests_can_be_run.md

@@ -108,6 +108,10 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_1P_PASSWORD` | - | Password for authenticating into 1Password. | No |
 | `QA_1P_SECRET` | - | Secret for authenticating into 1Password. | No |
 | `QA_1P_GITHUB_UUID` | - | UUID for GitHub item in GitLab-QA 1Password vault. | No |
+| `RELEASE` | - | The release image to use for an orchestrated GitLab instance. | No |
+| `RELEASE_REGISTRY_URL` | - | The registry url to fetch the release image for an orchestrated GitLab. | No |
+| `RELEASE_REGISTRY_USERNAME` | - | The username to log in to the registry for pulling the release image for orchestrated GitLab. | No |
+| `RELEASE_REGISTRY_PASSWORD` | - | The password to log in to the registry for pulling the release image for orchestrated GitLab. | No |
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 
@@ -311,7 +315,7 @@ $ gitlab-qa Test::Omnibus::Upgrade CE
 $ gitlab-qa Test::Omnibus::Upgrade gitlab/gitlab-ce:my-custom-tag
 ```
 
-### `Test::Omnibus::UpdateFromPrevious <full image address> <current_version> <major|minor>`
+### `Test::Omnibus::UpdateFromPrevious <full image address> <current_version> <major|minor> <from_edition>`
 
 Scenario verifies upgrade from previous (major|minor) version to current release.
 

data/lib/gitlab/qa/release.rb

@@ -152,17 +152,29 @@ module Gitlab
       def login_params
         return if Runtime::Env.skip_pull?
 
-        if dev_gitlab_org?
-          Runtime::Env.require_qa_dev_access_token!
-
-          {
-            username: Runtime::Env.gitlab_dev_username,
-            password: Runtime::Env.dev_access_token_variable,
-            registry: DEV_REGISTRY
-          }
-        elsif omnibus_mirror? || omnibus_security?
-          omnibus_login_params
+        params = if dev_gitlab_org?
+                   Runtime::Env.require_qa_dev_access_token!
+
+                   {
+                     username: Runtime::Env.gitlab_dev_username,
+                     password: Runtime::Env.dev_access_token_variable,
+                     registry: DEV_REGISTRY
+                   }
+                 elsif omnibus_mirror? || omnibus_security?
+                   omnibus_login_params
+                 end
+
+        populate_registry_env_vars(params)
+      end
+
+      def populate_registry_env_vars(params)
+        if params
+          Runtime::Env.release_registry_url = params[:registry]
+          Runtime::Env.release_registry_username = params[:username]
+          Runtime::Env.release_registry_password = params[:password]
         end
+
+        params
       end
 
       def omnibus_login_params

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

@@ -144,7 +144,11 @@ module Gitlab
           'QA_1P_EMAIL' => :qa_1p_email,
           'QA_1P_PASSWORD' => :qa_1p_password,
           'QA_1P_SECRET' => :qa_1p_secret,
-          'QA_1P_GITHUB_UUID' => :qa_1p_github_uuid
+          'QA_1P_GITHUB_UUID' => :qa_1p_github_uuid,
+          'RELEASE' => :release,
+          'RELEASE_REGISTRY_URL' => :release_registry_url,
+          'RELEASE_REGISTRY_USERNAME' => :release_registry_username,
+          'RELEASE_REGISTRY_PASSWORD' => :release_registry_password
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|

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

@@ -22,6 +22,13 @@ module Gitlab
             # @param [Array] *rspec_args rspec arguments
             # @return [void]
             def perform(release, current_version, semver_component, from_edition = nil, *rspec_args)
+              # When from_edition isn't actually passed but RSpec args arg passed with `-- rspec_args...`,
+              # from_edition is wrongly set to `--`, so we fix that here.
+              if from_edition == "--"
+                rspec_args.prepend('--')
+                from_edition = nil
+              end
+
               @current_release = QA::Release.new(release)
               @upgrade_path = Support::GitlabUpgradePath.new(
                 current_version,

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '10.1.0'
+    VERSION = '10.2.1'
   end
 end

metadata

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