gitlab-qa 8.15.0 → 8.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8235a7dbc3c61a6f538089128dc4a5ba7219c435a2fd107b9be7a7f8e79a23
-  data.tar.gz: 3ce7fbdcc46f5f7b7a25e87af2b681c8ef314c48afef9a7e0c139361dcfed7bc
+  metadata.gz: 152cd35b57e1bbf009afe181668f3a6e649f817c722ff6307ef9f556191151d7
+  data.tar.gz: 83ea90cac64da14866e36233a43d787236df0e345512de7599ed0f6546cea0ed
 SHA512:
-  metadata.gz: a44d2a6d39df421e02e6dcb96b41aa32a53a65366f983e853376bde2c6b0e17ab1099ccd1b675c4c0b4b93e2bdd94bf661fff2e02edf8e68d43a7e2535ae756c
-  data.tar.gz: 919565630e715538ed4867339a27e553d90a80b3185b1caab4303aa65ef026a882f3fbb6446cbf5eb0e95944659da6adf6270ba2ecece62b85e60117248d9aee
+  metadata.gz: 8dbacb3d78dae237acb357bca6e36c271aea9fd0a06bfba6adaec924a62045afa16d4f94299a2a262af0682dcd52feb701bd69ca1b893242ae456976d954a3d3
+  data.tar.gz: 226b3b3639a998ad756849ab41937afcee5e1265586f61a1ef3113cee6a2325def40c457a64a2c2445129816d959e7ebd3591fc35f462f70807941414bd844eb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.15.0)
+    gitlab-qa (8.15.1)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)
@@ -249,4 +249,4 @@ DEPENDENCIES
   webmock (= 3.7.0)
 
 BUNDLED WITH
-   2.3.24
+   2.4.2

data/docs/what_tests_can_be_run.md

@@ -1114,3 +1114,12 @@ $ gitlab-qa Test::Instance::Chaos
 
 [test-instance]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/instance/all.rb
 [smoke-instance]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/instance/smoke.rb
+
+### `Test::Integration::Import`
+
+This scenario will run specs tagged with `:import` tags.
+
+These tests are designed to validate import functionality by importing projects from `GitHub` or another `GitLab` instance.
+This scenario type spins up 2 gitlab instances and additionally an instance with simple http mock server.
+
+If environment variable `QA_MOCK_GITHUB` is set to `true`, all calls to `github.com` are rerouted to mock server.

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

@@ -369,14 +369,14 @@ module Gitlab
           env_var_value_if_defined('QA_COM_REGISTRY') || 'registry.gitlab.com'
         end
 
-        private
-
         def enabled?(value, default: true)
           return default if value.nil?
 
           (value =~ /^(false|no|0)$/i) != 0
         end
 
+        private
+
         def env_var_value_valid?(variable)
           !ENV[variable].blank?
         end

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

@@ -25,7 +25,6 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 Component::GitalyCluster.perform do |cluster|
                   cluster.config = @config
-                  cluster.release = release
                   # we need to get an IP for praefect before proceeding so it cannot be run in parallel with gitlab
                   cluster.instance(true).join
                 end

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

@@ -21,10 +21,7 @@ module Gitlab
                 gitlab.name = config.gitlab_name
                 gitlab.network = config.network
                 gitlab.omnibus_configuration << gitlab_omnibus_configuration
-                cluster = Component::GitalyCluster.perform do |cluster|
-                  cluster.release = release
-                  cluster.instance
-                end
+                cluster = Component::GitalyCluster.perform(&:instance)
                 gitlab.instance do
                   cluster.join
                   Runtime::Logger.info('Running Gitaly Cluster specs!')

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

@@ -52,11 +52,7 @@ module Gitlab
             def start_gitlab_instances(release)
               instances = [
                 { instance: source_gitlab, name: "import-source", additional_hosts: [] },
-                {
-                  instance: target_gitlab,
-                  name: "import-target",
-                  additional_hosts: ["api.github.com:#{mock_server.ip_address}"]
-                }
+                { instance: target_gitlab, name: "import-target", additional_hosts: mocked_hosts }
               ]
 
               ::Parallel.each(instances, in_threads: 2) do |gitlab_instance|
@@ -88,6 +84,16 @@ module Gitlab
                 }
               end
             end
+
+            # List of hosts that should be redirected to mock server
+            #
+            # @return [Array]
+            def mocked_hosts
+              hosts = []
+              hosts << "api.github.com:#{mock_server.ip_address}" if Runtime::Env.enabled?(ENV["QA_MOCK_GITHUB"])
+
+              hosts
+            end
           end
         end
       end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.15.0'
+    VERSION = '8.15.1'
   end
 end

metadata

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