gitlab-qa 4.18.0 → 4.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8e33bf4d877487bb51ea8065ebf88f3d994d185e7ae726231de792f940eb7b
-  data.tar.gz: 629036685c9ca7bb1e5bb95e2969bf406b91968d237f80af57e312c7a68b9018
+  metadata.gz: 6daf214b1c52ad13c9f871a2c225b2ab9545cab483edcd7ab141fc111910e493
+  data.tar.gz: dabd1832bb37451082e1e78a19b994cfe04b217eabc228aaa6b564ba14ea13e2
 SHA512:
-  metadata.gz: d3bd1fa727d5b757183ab56eec1caedc7371abc2721db21d5d461fee75dde415788437162211ab7aa7bdaf21c1cf754fb7a040a0296a1c1ae9fd4494156feb3a
-  data.tar.gz: 459de3a08075be669907795af61fb2dd253268f90b9600e15b0386a1d8f61192e5e203ec3fe9b3ec1c2332140b9fe1bf3bb8e7c07ec5ddb00ab347fa8a95c7f8
+  metadata.gz: 274e8aeeb5cef88b33d600188608da7a2d0376114846857329ea5c49436ea186906433a1bd7a2a74338655d9b003825e5224dbb32293d086b04c8c395715f832
+  data.tar.gz: 3a0b15e9b58854fe34cd3b02917e27d3411c3e62d985197735096ebc169dd745fa035820f4e6beaa9254100b4973ba28b70b115624bbc77774bf598e117e462e

data/.gitlab-ci.yml

@@ -10,7 +10,7 @@ stages:
   - notify
 
 variables:
-  TEST_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa
+  TEST_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.6
   DOCKER_DRIVER: overlay
   DOCKER_HOST: tcp://docker:2375
   QA_ARTIFACTS_DIR: $CI_PROJECT_DIR

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

@@ -73,6 +73,10 @@ module Gitlab
           @relative_path ||= ''
         end
 
+        def set_accept_insecure_certs
+          Runtime::Env.accept_insecure_certs = 'true'
+        end
+
         def instance
           prepare
           start

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

@@ -113,10 +113,6 @@ module Gitlab
         def set_simple_saml_hostname
           ::Gitlab::QA::Runtime::Env.simple_saml_hostname = hostname
         end
-
-        def set_accept_insecure_certs
-          ::Gitlab::QA::Runtime::Env.accept_insecure_certs = 'true'
-        end
       end
     end
   end

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

@@ -9,6 +9,7 @@ module Gitlab
             def initialize
               @gitlab_name = 'gitlab-group-saml'
               @spec_suite = 'QA::EE::Scenario::Test::Integration::GroupSAML'
+              @saml_component = false
             end
 
             def before_perform(release)
@@ -16,12 +17,6 @@ module Gitlab
             end
 
             def configure(gitlab, saml)
-              saml.set_entity_id("#{gitlab.address}/groups/#{saml.group_name}")
-              saml.set_assertion_consumer_service("#{gitlab.address}/groups/#{saml.group_name}/-/saml/callback")
-              saml.set_sandbox_name(saml.group_name)
-              saml.set_simple_saml_hostname
-              saml.set_accept_insecure_certs
-
               gitlab.omnibus_config = <<~OMNIBUS
                 gitlab_rails['omniauth_enabled'] = true;
                 gitlab_rails['omniauth_providers'] = [{ name: 'group_saml' }];

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

@@ -9,13 +9,13 @@ module Gitlab
             def initialize
               @gitlab_name = 'gitlab-instance-saml'
               @spec_suite = 'Test::Integration::InstanceSAML'
+              @saml_component = true
             end
 
             def configure(gitlab, saml)
               saml.set_entity_id(gitlab.address)
               saml.set_assertion_consumer_service("#{gitlab.address}/users/auth/saml/callback")
               saml.set_simple_saml_hostname
-              saml.set_accept_insecure_certs
 
               gitlab.omnibus_config = <<~OMNIBUS
                 gitlab_rails['omniauth_enabled'] = true;

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

@@ -14,12 +14,8 @@ module Gitlab
               super
             end
 
-            def set_accept_insecure_certs
-              ::Gitlab::QA::Runtime::Env.accept_insecure_certs = 'true'
-            end
-
             def configure_omnibus(gitlab)
-              set_accept_insecure_certs
+              gitlab.set_accept_insecure_certs
               gitlab.omnibus_config = <<~OMNIBUS
                     gitlab_rails['ldap_enabled'] = true;
                     gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config};

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

@@ -6,7 +6,7 @@ module Gitlab
       module Test
         module Integration
           class SAML < Scenario::Template
-            attr_reader :gitlab_name, :spec_suite
+            attr_reader :gitlab_name, :spec_suite, :saml_component
 
             def configure(gitlab, saml)
               raise NotImplementedError
@@ -24,23 +24,33 @@ module Gitlab
                 gitlab.release = release
                 gitlab.network = 'test'
                 gitlab.name = gitlab_name
+                gitlab.set_accept_insecure_certs
 
-                Component::SAML.perform do |saml|
-                  saml.network = 'test'
-                  configure(gitlab, saml)
+                if saml_component
+                  Component::SAML.perform do |saml|
+                    saml.network = 'test'
+                    configure(gitlab, saml)
 
-                  saml.instance do
-                    gitlab.instance do
-                      puts "Running #{spec_suite} specs!"
-
-                      Component::Specs.perform do |specs|
-                        specs.suite = spec_suite
-                        specs.release = release
-                        specs.network = gitlab.network
-                        specs.args = [gitlab.address, *rspec_args]
-                      end
+                    saml.instance do
+                      run_specs(gitlab, release, *rspec_args)
                     end
                   end
+                else
+                  configure(gitlab, nil)
+                  run_specs(gitlab, release, *rspec_args)
+                end
+              end
+            end
+
+            def run_specs(gitlab, release, *rspec_args)
+              gitlab.instance do
+                puts "Running #{spec_suite} specs!"
+
+                Component::Specs.perform do |specs|
+                  specs.suite = spec_suite
+                  specs.release = release
+                  specs.network = gitlab.network
+                  specs.args = [gitlab.address, *rspec_args]
                 end
               end
             end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.18.0'.freeze
+    VERSION = '4.19.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.18.0
+  version: 4.19.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control