gitlab-qa 7.18.1 → 7.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b05f451b8f3fef95132c1392719b6e20d777c495778df260ca340af2db4dc21
-  data.tar.gz: ebea6af07ab05c224982347a5d71c2ccfd31e0eaede1fa40a27c2fae65bc3da8
+  metadata.gz: 7314a9036c9aeacae478aaf82d13baee97c53c94bf5aabe800ec0e9f98b5234d
+  data.tar.gz: 83fe883428323a6edc87c1993564de31dcd5afc79aada90798ea07d93a1b09fb
 SHA512:
-  metadata.gz: 2724c38eb788f497af697dd743618ed13b45873e9b9da8937943489146a517cb6d067bf7d8354d77f4349fa8b19b35118e99919eba4ff43b39f8e2de24668035
-  data.tar.gz: b93d8f4055d6a9b6d897202da7f413a181293fc25b49aa30709976fd4d1da0e86bc2e4976f73b738f539de1a0e6438247bd8df814c7d853a05eb18d1c0243812
+  metadata.gz: 7e3d05561762175dae31c8298ef4411595287f516f3fc809457e842c368a7ea712c6c2f697a1c1849c1ff26b060b68220327e5d3cb5e5792426bb886881a233a
+  data.tar.gz: 062b24dfdf48a7da1d309b0282f4972d1f6e72dbb2ad4a44f2ad8c2c352f3684ff0b423390070dcc83c9228b19597bc0ddfee94aef017810f5283c673511e472

data/.gitlab-ci.yml

@@ -1212,7 +1212,6 @@ ee:large-setup:
 ee:cloud-activation:
   before_script:
     - unset EE_LICENSE
-    - unset GITLAB_QA_FORMLESS_LOGIN_TOKEN
     - !reference [default, before_script]
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
@@ -1221,12 +1220,11 @@ ee:cloud-activation:
     - .ee-variables
     - .rspec-report-opts
   variables:
-    QA_SCENARIO: "Test::Integration::CloudActivation"
+    QA_RSPEC_TAGS: "--tag cloud_activation"
 
 ee:cloud-activation-quarantine:
   before_script:
     - unset EE_LICENSE
-    - unset GITLAB_QA_FORMLESS_LOGIN_TOKEN
     - !reference [default, before_script]
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
@@ -1236,7 +1234,7 @@ ee:cloud-activation-quarantine:
     - .quarantine
     - .rspec-report-opts
   variables:
-    QA_SCENARIO: "Test::Integration::CloudActivation"
+    QA_RSPEC_TAGS: "--tag cloud_activation"
 
 # This job requires the `GITLAB_QA_ACCESS_TOKEN` and `GITLAB_QA_DEV_ACCESS_TOKEN`
 # variable to be passed when triggered.

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

@@ -12,7 +12,7 @@ module Gitlab
       class Gitlab < Base
         extend Forwardable
 
-        attr_reader :release, :omnibus_configuration
+        attr_reader :release, :omnibus_configuration, :omnibus_gitlab_rails_env
         attr_accessor :tls, :skip_availability_check, :runner_network
         attr_writer :name, :relative_path
 
@@ -29,6 +29,7 @@ module Gitlab
           super
 
           @skip_availability_check = false
+          @omnibus_gitlab_rails_env = {}
 
           @volumes[GITLAB_CERTIFICATES_PATH] = SSL_PATH
           @volumes[AUTHORITY_CERTIFICATES_PATH] = TRUSTED_PATH
@@ -41,7 +42,14 @@ module Gitlab
         def set_formless_login_token
           return if Runtime::Env.gitlab_qa_formless_login_token.to_s.strip.empty?
 
-          @omnibus_configuration << "gitlab_rails['env'] = { 'GITLAB_QA_FORMLESS_LOGIN_TOKEN' => '#{Runtime::Env.gitlab_qa_formless_login_token}' }"
+          @omnibus_gitlab_rails_env['GITLAB_QA_FORMLESS_LOGIN_TOKEN'] = Runtime::Env.gitlab_qa_formless_login_token
+        end
+
+        def set_license_mode
+          return unless Runtime::Env.test_license_mode?
+
+          @omnibus_gitlab_rails_env['GITLAB_LICENSE_MODE'] = 'test'
+          @omnibus_gitlab_rails_env['CUSTOMER_PORTAL_URL'] = 'https://customers.staging.gitlab.com'
         end
 
         def elastic_url=(url)
@@ -95,6 +103,9 @@ module Gitlab
 
         def prepare_gitlab_omnibus_config
           set_formless_login_token
+          set_license_mode
+
+          @omnibus_configuration << "gitlab_rails['env'] = #{@omnibus_gitlab_rails_env}" unless omnibus_gitlab_rails_env.empty?
         end
 
         def start # rubocop:disable Metrics/AbcSize

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

@@ -310,6 +310,10 @@ module Gitlab
           enabled?(env_var_value_if_defined('GEO_FAILOVER'), default: false)
         end
 
+        def test_license_mode?
+          enabled?(env_var_value_if_defined('TEST_LICENSE_MODE'), default: false)
+        end
+
         private
 
         def enabled?(value, default: true)

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.18.1'
+    VERSION = '7.19.0'
   end
 end

data/lib/gitlab/qa.rb

@@ -74,7 +74,6 @@ module Gitlab
           autoload :Registry, 'gitlab/qa/scenario/test/integration/registry'
           autoload :RegistryTLS, 'gitlab/qa/scenario/test/integration/registry_tls'
           autoload :ServicePingDisabled, 'gitlab/qa/scenario/test/integration/service_ping_disabled'
-          autoload :CloudActivation, 'gitlab/qa/scenario/test/integration/cloud_activation'
         end
 
         module Sanity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.18.1
+  version: 7.19.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -310,7 +310,6 @@ files:
 - lib/gitlab/qa/scenario/test/instance/staging_ref.rb
 - lib/gitlab/qa/scenario/test/integration/actioncable.rb
 - lib/gitlab/qa/scenario/test/integration/client_ssl.rb
-- lib/gitlab/qa/scenario/test/integration/cloud_activation.rb
 - lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
 - lib/gitlab/qa/scenario/test/integration/geo.rb
 - lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb

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

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class CloudActivation < Scenario::Template
-            def perform(release, *rspec_args)
-              Component::Gitlab.perform do |gitlab|
-                gitlab.release = release
-                gitlab.network = 'test'
-
-                gitlab.omnibus_configuration << <<~OMNIBUS
-                  gitlab_rails['env'] = { 'GITLAB_LICENSE_MODE' => 'test', 'CUSTOMER_PORTAL_URL' => 'https://customers.staging.gitlab.com' }
-                OMNIBUS
-
-                gitlab.instance do
-                  rspec_args << "--" unless rspec_args.include?('--')
-                  rspec_args << %w[--tag cloud_activation]
-
-                  Component::Specs.perform do |specs|
-                    specs.suite = 'Test::Instance::All'
-                    specs.release = gitlab.release
-                    specs.network = gitlab.network
-                    specs.args = [gitlab.address, *rspec_args]
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end