gitlab-qa 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77fe1e1cf434c67aaf9d068460b8269e31c988a8c77e93ff3427545370849d9b
-  data.tar.gz: bd9b0dc5b3a89075336da34ea0ebb6882228a06fcb7320003f906cdf5e17004b
+  metadata.gz: 6dadc43941496ac21420fd5fd18374a72a360ff06c1d34e67717232de4125fca
+  data.tar.gz: 9f077c485987efd4609d1c1c126a45d6961bdc77062afe99a368f0b2ddb66339
 SHA512:
-  metadata.gz: 10e68578bdbe034db633daf9fe238a9f200590ade25e4018b9889a9ab6bd3b71d72131c27044f7d9c740965febca1e64fa5f68bb231e377b278b01b71a713aa0
-  data.tar.gz: 02d8e5f9e03dc50caa19418c8d8f008909498b1fb963ed09867474df95fee3eade6e1b002b359354df4e3396e0bdb2ab1cdb39c6fb185ea87c05e9464dbbd2a7
+  metadata.gz: 47f96a6b986d312ec419ac645063ab1009868acb1640a8f9936ede35b69c45ecb036526486dc92cc3bebe49bc5edcd75c6dee7141f3171f333ab8c4599014692
+  data.tar.gz: cb2a2fcc6f2f8f11c8df3dc616528634d8cf9f17bbed53f0c0c6fd04a9bc0ebba676612047db50dcf94a0bfbf0d5043cea492fef2c1a86e6b770ceb131fd6cfc

data/lib/gitlab/qa.rb

@@ -26,6 +26,7 @@ module Gitlab
           autoload :Smoke, 'gitlab/qa/scenario/test/instance/smoke'
           autoload :Preprod, 'gitlab/qa/scenario/test/instance/preprod'
           autoload :Geo, 'gitlab/qa/scenario/test/instance/geo'
+          autoload :StagingGeo, 'gitlab/qa/scenario/test/instance/staging_geo'
         end
 
         module Omnibus

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

@@ -7,6 +7,7 @@ module Gitlab
     module Component
       class Staging
         ADDRESS = 'https://staging.gitlab.com'.freeze
+        GEO_SECONDARY_ADDRESS = 'https://geo.staging.gitlab.com'.freeze
 
         def self.release
           Release.new(image)

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

@@ -7,7 +7,12 @@ module Gitlab
           # Base class to be used to define deployment environment scenarios
           #
           class DeploymentBase < Scenario::Template
+            def initialize
+              @suite = 'Test::Instance::All'
+            end
+
             def perform(release_name = nil, *args)
+              # EE_LICENSE variable should be unset otherwise the existing license may be accidentially replaced
               Runtime::Env.require_no_license!
 
               release = if release_name.nil? || release_name.start_with?('--')
@@ -19,12 +24,16 @@ module Gitlab
               args.unshift(release_name) if release_name&.start_with?('--')
 
               Component::Specs.perform do |specs|
-                specs.suite = 'Test::Instance::All'
+                specs.suite = @suite
                 specs.release = release
-                specs.args = [deployment_component::ADDRESS, *args]
+                specs.args = non_rspec_args.push(*args)
               end
             end
 
+            def non_rspec_args
+              [deployment_component::ADDRESS]
+            end
+
             def deployment_component
               raise NotImplementedError, 'Please define the Component for the deployment environment associated with this scenario.'
             end

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

@@ -0,0 +1,30 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Instance
+          ##
+          # Run test suite against staging.gitlab.com
+          #
+          class StagingGeo < DeploymentBase
+            def initialize
+              @suite = 'QA::EE::Scenario::Test::Geo'
+            end
+
+            def deployment_component
+              Component::Staging
+            end
+
+            def non_rspec_args
+              [
+                '--primary-address', deployment_component::ADDRESS,
+                '--secondary-address', deployment_component::GEO_SECONDARY_ADDRESS,
+                '--without-setup'
+              ]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.5.0'.freeze
+    VERSION = '5.6.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -274,6 +274,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/repository_storage.rb
 - lib/gitlab/qa/scenario/test/instance/smoke.rb
 - lib/gitlab/qa/scenario/test/instance/staging.rb
+- lib/gitlab/qa/scenario/test/instance/staging_geo.rb
 - lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
 - lib/gitlab/qa/scenario/test/integration/geo.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb