gitlab-qa 4.19.3 → 4.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365a0ce68c65b067549f157ad77556b2a73acd68e8bcf80b9a1b71eaaf038131
-  data.tar.gz: 4d621dc1dd3acf0806b4aca7d48ee71666f987233d29a5cec9005c91c79b6601
+  metadata.gz: 066aa882ca586d0186ec53fb1cb7e55276a5081280993568e681c73ffa760bfb
+  data.tar.gz: 11b473e0b82f5842de908b43dad5699dcdd07fd2d444228548bdd7b21cde2639
 SHA512:
-  metadata.gz: 8476332ec379c56295af553b573f06273b03f6cf91f69a83d764bbd57c1e71ac9739ea429db9b8a9552a372a073111cedf45c4697158504685c9b36b6cbf7a40
-  data.tar.gz: b0853d070633351b9aa011c57e4e746e9639773fba1371bb4e2b731c1ae84cae3ae72afd56938f4e146d267d7c8720ba2418fc1951bae2ace2b4be5a1b22f8e1
+  metadata.gz: d9298cbb9e265a96d9f969919992920046f8566452af76252008b2ae7500350965168844bf7bca0d9632163ad34b457dc21b623912b32091f8c6c683932dcf54
+  data.tar.gz: b7cc0ebfd6b6c35085ab94ada285238e68b5577318d16b559fbb2c28b884d9e9135093749627d7fd02a27543ab4d343a26616cc694027146ab9b5997b0bfb6e9

data/.gitlab-ci.yml

@@ -248,6 +248,44 @@ ee:relative_url-quarantine:
     - .quarantine
     - .rspec-report-opts
 
+ce:repository_storage:
+  script:
+    - exe/gitlab-qa Test::Instance::RepositoryStorage ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+
+ce:repository_storage-quarantine:
+  script:
+    - exe/gitlab-qa Test::Instance::RepositoryStorage ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
+ee:repository_storage:
+  script:
+    - exe/gitlab-qa Test::Instance::RepositoryStorage ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+
+ee:repository_storage-quarantine:
+  script:
+    - exe/gitlab-qa Test::Instance::RepositoryStorage ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:image:
   script:
     - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=CE}

data/docs/what_tests_can_be_run.md

@@ -61,6 +61,7 @@ For more details on the internals, please read the
   for failing tests will be saved (default: `/tmp/gitlab-qa`)
 * `DOCKER_HOST` - Docker host to run tests against (default: `http://localhost`)
 * `CHROME_HEADLESS` - when running locally, set to `false` to allow Chrome tests to be visible - watch your tests being run
+* `QA_ADDITIONAL_REPOSITORY_STORAGE` - the name of additional, non-default storage to be used with tests tagged `repository_storage`, run via the `Test::Instance::RepositoryStorage` scenario
 * `QA_COOKIES` - optionally set to "cookie1=value;cookie2=value" in order to add a cookie to every request. This can be used to set the canary cookie by setting it to "gitlab_canary=true"
 * `QA_DEBUG` - set to `true` to verbosely log page object actions. Note: if enabled be aware that sensitive data might be logged. If an input element has a QA selector with `password` in the name, data entered into the input element will be masked. If the element doesn't have `password` in its name it won't be masked.
 * `QA_LOG_PATH` - path to output debug logging to. If not set logging will be output to STDOUT

data/lib/gitlab/qa.rb

@@ -18,6 +18,7 @@ module Gitlab
           autoload :DeploymentBase, 'gitlab/qa/scenario/test/instance/deployment_base'
           autoload :Image, 'gitlab/qa/scenario/test/instance/image'
           autoload :RelativeUrl, 'gitlab/qa/scenario/test/instance/relative_url'
+          autoload :RepositoryStorage, 'gitlab/qa/scenario/test/instance/repository_storage'
           autoload :Staging, 'gitlab/qa/scenario/test/instance/staging'
           autoload :Production, 'gitlab/qa/scenario/test/instance/production'
           autoload :Smoke, 'gitlab/qa/scenario/test/instance/smoke'

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

@@ -8,11 +8,12 @@ module Gitlab
       # the `qa/` directory located in GitLab CE / EE repositories.
       #
       class Specs < Scenario::Template
-        attr_accessor :suite, :release, :network, :args, :volumes
+        attr_accessor :suite, :release, :network, :args, :volumes, :env
 
         def initialize
           @docker = Docker::Engine.new
           @volumes = {}
+          @env = {}
         end
 
         def perform # rubocop:disable Metrics/AbcSize
@@ -36,7 +37,7 @@ module Gitlab
           @docker.run(release.qa_image, release.qa_tag, suite, *args) do |command|
             command << "-t --rm --net=#{network || 'bridge'}"
 
-            Runtime::Env.variables.each do |key, value|
+            env.merge(Runtime::Env.variables).each do |key, value|
               command.env(key, value)
             end
 

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

@@ -35,6 +35,7 @@ module Gitlab
           'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
           'GCLOUD_REGION' => :gcloud_region,
           'SIGNUP_DISABLED' => :signup_disabled,
+          'QA_ADDITIONAL_REPOSITORY_STORAGE' => :qa_additional_repository_storage,
           'QA_COOKIES' => :qa_cookie,
           'QA_DEBUG' => :qa_debug,
           'QA_LOG_PATH' => :qa_log_path,

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

@@ -0,0 +1,42 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Instance
+          class RepositoryStorage < Image
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = Release.new(release)
+                gitlab.name = 'gitlab'
+                gitlab.network = 'test'
+                gitlab.omnibus_config = <<~OMNIBUS
+                  git_data_dirs({
+                    'default' => {
+                      'path' => '/var/opt/gitlab/git-data/repositories/default'
+                    },
+                    'secondary' => {
+                      'path' => '/var/opt/gitlab/git-data/repositories/secondary'
+                    }
+                  });
+                OMNIBUS
+
+                rspec_args << "--" unless rspec_args.include?('--')
+                rspec_args << %w[--tag repository_storage]
+
+                gitlab.instance do
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Instance::All'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                    specs.env = { 'QA_ADDITIONAL_REPOSITORY_STORAGE' => 'secondary' }
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.19.3'.freeze
+    VERSION = '4.20.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.19.3
+  version: 4.20.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -207,6 +207,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/preprod.rb
 - lib/gitlab/qa/scenario/test/instance/production.rb
 - lib/gitlab/qa/scenario/test/instance/relative_url.rb
+- 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/integration/elasticsearch.rb