gitlab-qa 4.14.0 → 4.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389ff8b81cbd1b20714915c03adb9c7fdaa89a943cb779cb0400f2a2ec5fa510
-  data.tar.gz: 20eff9a875b9e70716467801c06438ee32a576d8472d44ba8b29fae1d4daf79a
+  metadata.gz: 415519ce7e943e339896c4d2bc9882351b3a7de574663846d6ff5d3d79a2eaea
+  data.tar.gz: c40c62933d70c3915a3bfe529322901e08418d399e886e4d100a7e37709d6ee3
 SHA512:
-  metadata.gz: ca629820b3697bd82e536a02e0ae7fc4b67c7c2499479d72c3f077772cfc1014b53ee96e74db485ad2a72679293a21b7982ea2d2c866bbb5cab75efb50738638
-  data.tar.gz: 8257a4863f9ed7860f0ee944fc0393051b591d027519f04bc665ca95f700741551571096bced72c9743b03ea889ea9fb4c4a64154cd1006de932606ed3838a20
+  metadata.gz: 9f0af9c37ef4051fa141031c035794427f2c34e1b72d992aea5b1703def825fdc41dfd6c52065646ca95373b914165d224a0cc6ed0be4867909d6259fcd27d41
+  data.tar.gz: d25f9adf618a485f60ac278618e723512c8ee1ad1d500a7e919c17d147128b68d908a85263a39463a3b226866ccd38acbc71d243fc2706080404baf0a4f7aa37

data/lib/gitlab/qa.rb

@@ -10,6 +10,7 @@ module Gitlab
     module Scenario
       autoload :Actable, 'gitlab/qa/scenario/actable'
       autoload :Template, 'gitlab/qa/scenario/template'
+      autoload :CLICommands, 'gitlab/qa/scenario/cli_commands'
 
       module Test
         module Instance

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

@@ -141,7 +141,7 @@ module Gitlab
         end
 
         def require_kubernetes_environment!
-          %w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT GCLOUD_REGION].each do |env_key|
+          %w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT].each do |env_key|
             raise ArgumentError, "Environment variable #{env_key} must be set to run kubernetes specs" unless ENV.key?(env_key)
           end
         end

data/lib/gitlab/qa/scenario/cli_commands.rb

@@ -0,0 +1,16 @@
+module Gitlab
+  module QA
+    module Scenario
+      module CLICommands
+        GIT_LFS_VERSION = '2.8.0'.freeze
+
+        def git_lfs_install_commands
+          @git_lfs_install_commands ||= [
+            "cd /tmp ; curl -qsL https://github.com/git-lfs/git-lfs/releases/download/v#{GIT_LFS_VERSION}/git-lfs-linux-amd64-v#{GIT_LFS_VERSION}.tar.gz | tar xzvf -",
+            'cp /tmp/git-lfs /usr/local/bin'
+          ]
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,7 @@ module Gitlab
       module Test
         module Integration
           class Geo < Scenario::Template
-            GIT_LFS_VERSION = '2.8.0'.freeze
-
+            include Scenario::CLICommands
             ##
             # rubocop:disable Lint/MissingCopEnableDirective
             # rubocop:disable Metrics/AbcSize
@@ -103,13 +102,6 @@ module Gitlab
                 'gitlab-ctl restart sshd'
               ]
             end
-
-            def git_lfs_install_commands
-              @git_lfs_install_commands ||= [
-                "cd /tmp ; curl -qsL https://github.com/git-lfs/git-lfs/releases/download/v#{GIT_LFS_VERSION}/git-lfs-linux-amd64-v#{GIT_LFS_VERSION}.tar.gz | tar xzvf -",
-                'cp /tmp/git-lfs /usr/local/bin'
-              ]
-            end
           end
         end
       end

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

@@ -6,6 +6,8 @@ module Gitlab
       module Test
         module Integration
           class ObjectStorage < Scenario::Template
+            include Scenario::CLICommands
+
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
@@ -14,7 +16,9 @@ module Gitlab
 
                 Component::Minio.perform do |minio|
                   minio.network = 'test'
-                  minio.add_bucket('upload-bucket')
+                  ['upload-bucket', 'lfs-bucket'].each do |bucket_name|
+                    minio.add_bucket(bucket_name)
+                  end
 
                   gitlab.omnibus_config = <<~OMNIBUS
                     gitlab_rails['uploads_object_store_enabled'] = true;
@@ -23,11 +27,20 @@ module Gitlab
                     gitlab_rails['uploads_object_store_direct_upload'] = true;
                     gitlab_rails['uploads_object_store_proxy_download'] = true;
                     gitlab_rails['uploads_object_store_connection'] = #{minio.to_config};
+                    gitlab_rails['lfs_enabled'] = true;
+                    gitlab_rails['lfs_storage_path'] = '/var/opt/gitlab/gitlab-rails/shared/lfs-objects';
+                    gitlab_rails['lfs_object_store_enabled'] = true;
+                    gitlab_rails['lfs_object_store_direct_upload'] = true;
+                    gitlab_rails['lfs_object_store_background_upload'] = false;
+                    gitlab_rails['lfs_object_store_proxy_download'] = false;
+                    gitlab_rails['lfs_object_store_remote_directory'] = 'lfs-bucket';
+                    gitlab_rails['lfs_object_store_connection'] = #{minio.to_config};
                   OMNIBUS
+                  gitlab.exec_commands = git_lfs_install_commands
 
                   minio.instance do
                     gitlab.instance do
-                      puts 'Running object store specs!'
+                      puts 'Running object storage specs!'
 
                       Component::Specs.perform do |specs|
                         specs.suite = 'Test::Integration::ObjectStorage'

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.14.0'.freeze
+    VERSION = '4.15.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.15.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -183,6 +183,7 @@ files:
 - lib/gitlab/qa/runner.rb
 - lib/gitlab/qa/runtime/env.rb
 - lib/gitlab/qa/scenario/actable.rb
+- lib/gitlab/qa/scenario/cli_commands.rb
 - lib/gitlab/qa/scenario/template.rb
 - lib/gitlab/qa/scenario/test/instance/any.rb
 - lib/gitlab/qa/scenario/test/instance/deployment_base.rb