gitlab-qa 7.8.4 → 7.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8e6f385001950cb2511426d82a6acac3c3615683b8dbd48214df976c6fb07d5
-  data.tar.gz: 51de85c6c9c5dca24ba24961d45005d9ff2bbe168d7a8819f54ee6412ab0abcd
+  metadata.gz: 75ab48c7d1d2eba818e59d14fdf90a781faf6af477c5993f2ebe27296be785bd
+  data.tar.gz: bc2614ee2f780463fc21360b2e28885227bfe251e8dd5592657feb6b605fc264
 SHA512:
-  metadata.gz: e4ee08298871f1dff0ce9e0c007ac1c7e6d643fd13161f38beac5a59574a43931abf87a904488ba1b9e6037d451b22ad151b10afed9df41ed68bf39b1500e18e
-  data.tar.gz: 266d10c931d8762dcfb34e9aa07f44a38dd1656cccbdd38a7e559ce04d8fec2144f5156f8b8cc4a372db9420a064940861e17146e78d77c0966cbd497e5a4001
+  metadata.gz: 16de17dbf4a4c463fcc185e2432297b597a1d6704f02073010be159dc9994739b20d4733038721011fd1051918589c0cd93d3922d663cc3e3c4dd81545e2e4b0
+  data.tar.gz: 3208f2280f9d00c45e051e1bc2894dfbd9df989e7430931d5375054a79499c67c07f95b66dcee6a066ed9019c613cf6d976fa97ef35596c9e2459c43363c7023

data/.gitlab-ci.yml

@@ -682,6 +682,27 @@ ee:object_storage_aws-quarantine:
     GITLAB_QA_OPTS: "--omnibus-config object_storage_aws"
     QA_RSPEC_TAGS: "--tag quarantine --tag object_storage"
 
+ee:object_storage_gcs:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    GITLAB_QA_OPTS: "--omnibus-config object_storage_gcs"
+    QA_RSPEC_TAGS: "--tag object_storage"
+
+ee:object_storage_gcs-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    GITLAB_QA_OPTS: "--omnibus-config object_storage_gcs"
+    QA_RSPEC_TAGS: "--tag quarantine --tag object_storage"
+
 ee:object_storage:
   extends:
     - .test

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

@@ -104,7 +104,11 @@ module Gitlab
           'AWS_S3_KEY_ID' => :aws_s3_key_id,
           'AWS_S3_ACCESS_KEY' => :aws_s3_access_key,
           'AWS_S3_BUCKET_NAME' => :aws_s3_bucket_name,
-          'TOP_UPSTREAM_MERGE_REQUEST_IID' => :top_upstream_merge_request_iid
+          'TOP_UPSTREAM_MERGE_REQUEST_IID' => :top_upstream_merge_request_iid,
+          'GOOGLE_PROJECT' => :google_project,
+          'GOOGLE_CLIENT_EMAIL' => :google_client_email,
+          'GOOGLE_JSON_KEY' => :google_json_key,
+          'GCS_BUCKET_NAME' => :gcs_bucket_name
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
@@ -299,6 +303,12 @@ module Gitlab
           end
         end
 
+        def require_gcs_environment!
+          %w[GOOGLE_PROJECT GOOGLE_CLIENT_EMAIL GOOGLE_JSON_KEY GCS_BUCKET_NAME].each do |env_key|
+            raise ArgumentError, "Environment variable #{env_key} must be set to run GCS object storage specs" unless ENV.key?(env_key)
+          end
+        end
+
         def require_initial_password!
           return unless ENV['GITLAB_INITIAL_ROOT_PASSWORD'].to_s.strip.empty?
 

data/lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+require 'tempfile'
+
+module Gitlab
+  module QA
+    module Runtime
+      module OmnibusConfigurations
+        class ObjectStorageGcs < Default
+          def configuration
+            Runtime::Env.require_gcs_environment!
+
+            json_key = setup_json_key
+
+            <<~OMNIBUS
+              gitlab_rails['object_store']['connection'] = { 'provider' => 'Google', 'google_project' => '#{Runtime::Env.google_project}', 'google_client_email' => '#{Runtime::Env.google_client_email}', 'google_json_key_location' => '#{json_key.path}' }
+
+              gitlab_rails['object_store']['objects']['artifacts']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['lfs']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['uploads']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['packages']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['pages']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+            OMNIBUS
+          end
+
+          def setup_json_key
+            Tempfile.open('gcs-json-key', ENV['CI_PROJECT_DIR']) do |file|
+              file.write(ENV.fetch('GOOGLE_JSON_KEY'))
+
+              file
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.8.4'.freeze
+    VERSION = '7.8.5'.freeze
   end
 end

data/lib/gitlab/qa.rb

@@ -15,6 +15,7 @@ module Gitlab
         autoload :Packages, 'gitlab/qa/runtime/omnibus_configurations/packages'
         autoload :ObjectStorage, 'gitlab/qa/runtime/omnibus_configurations/object_storage'
         autoload :ObjectStorageAws, 'gitlab/qa/runtime/omnibus_configurations/object_storage_aws'
+        autoload :ObjectStorageGcs, 'gitlab/qa/runtime/omnibus_configurations/object_storage_gcs'
         autoload :LicenseMode, 'gitlab/qa/runtime/omnibus_configurations/license_mode'
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.8.4
+  version: 7.8.5
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -294,6 +294,7 @@ files:
 - lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_aws.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/packages.rb
 - lib/gitlab/qa/runtime/scenario.rb
 - lib/gitlab/qa/runtime/token_finder.rb