gitlab-qa 11.2.0 → 12.0.0

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # rubocop:disable Metrics/AbcSize
 
 require 'securerandom'
@@ -17,19 +18,19 @@ module Gitlab
         using Rainbow
 
         attr_reader :release,
-                    :omnibus_configuration,
-                    :omnibus_gitlab_rails_env,
-                    :authority_volume,
-                    :ssl_volume
+          :omnibus_configuration,
+          :omnibus_gitlab_rails_env,
+          :authority_volume,
+          :ssl_volume
 
         attr_accessor :tls,
-                      :skip_availability_check,
-                      :runner_network,
-                      :seed_admin_token,
-                      :seed_db,
-                      :skip_server_hooks,
-                      :gitaly_tls,
-                      :secrets
+          :skip_availability_check,
+          :runner_network,
+          :seed_admin_token,
+          :seed_db,
+          :skip_server_hooks,
+          :gitaly_tls,
+          :secrets
 
         attr_writer :name, :relative_path
 
@@ -182,9 +183,9 @@ module Gitlab
         def reconfigure
           setup_omnibus
 
-          @docker.attach(name) do |line, wait|
+          @docker.attach(name) do |line, _wait|
             # TODO, workaround which allows to detach from the container
-            break if /gitlab Reconfigured!/.match?(line)
+            break if line.include?('gitlab Reconfigured!')
           end
         end
 
@@ -236,17 +237,23 @@ module Gitlab
         end
 
         def create_key_file(env_key)
-          key_file = Tempfile.create(env_key.downcase, ENV['CI_PROJECT_DIR'] || Dir.tmpdir).then do |file|
+          directory = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
+          unique_filename = "#{env_key.downcase}_#{Time.now.to_i}_#{rand(100)}"
+          key_file_path = File.join(directory, unique_filename)
+
+          File.open(key_file_path, 'w') do |file|
             file.write(ENV.fetch(env_key))
             file.fsync
-            file.close
-
-            file.path
           end
-          File.chmod(0o744, key_file)
-          @volumes[key_file] = key_file
 
-          key_file
+          File.chmod(0o744, key_file_path)
+          @volumes[key_file_path] = key_file_path
+
+          key_file_path
+        end
+
+        def delete_key_file(path)
+          FileUtils.rm_f(path)
         end
 
         private

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This component sets up the MailHog (https://github.com/mailhog/MailHog)
 # image with the proper configuration for SMTP email delivery from Gitlab
 

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

@@ -37,7 +37,7 @@ module Gitlab
           setup_omnibus
           @docker.attach(name) do |line|
             # TODO, workaround which allows to detach from the container
-            break if /gitlab Reconfigured!/.match?(line)
+            break if line.include?('gitlab Reconfigured!')
           end
         end
 
@@ -50,7 +50,7 @@ module Gitlab
         def wait_until_ready
           @docker.exec(name, 'praefect -config /var/opt/gitlab/praefect/cluster_config.toml check || true') do |resp|
             Runtime::Logger.info(resp)
-            break if /All checks passed/.match?(line)
+            break if line.include?('All checks passed')
           end
         end
 

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

@@ -29,10 +29,12 @@ module Gitlab
           pull_images
           docker.run(image: image, tag: tag, args:
                       ['-video-recorder-image',
-                       QA::Runtime::Env.video_recorder_image,
-                       '-container-network',
-                       network]
-                    ) do |command|
+                        QA::Runtime::Env.video_recorder_image,
+                        '-container-network',
+                        network,
+                        '-timeout',
+                        '10m0s']
+          ) do |command|
             set_command_args(command)
             set_volumes(command)
           end
@@ -53,14 +55,15 @@ module Gitlab
         private
 
         def grid_healthy?
-          HTTP.get('http://docker:4444/ping').status&.success?
+          host = ENV['CI'] || ENV['CI_SERVER'] ? 'docker' : 'localhost'
+          HTTP.get("http://#{host}:4444/ping").status&.success?
         rescue HTTP::ConnectionError => e
           Runtime::Logger.debug(e)
           false
         end
 
         def pull_images
-          docker.pull(image: QA::Runtime::Env.browser_image, tag: Runtime::Env.browser_version)
+          docker.pull(image: QA::Runtime::Env.selenoid_browser_image, tag: Runtime::Env.selenoid_browser_version)
           docker.pull(image: QA::Runtime::Env.video_recorder_image, tag: QA::Runtime::Env.video_recorder_version)
         end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # rubocop:disable Metrics/CyclomaticComplexity
 # rubocop:disable Metrics/AbcSize
 
@@ -56,8 +57,10 @@ module Gitlab
 
           feature_flag_sets = []
 
-          # When `args` includes `[..., "--disable-feature", "a", "--enable-feature", "b", "--set-feature-flags", "c=enable", ...]`
-          # `feature_flag_sets` will be set to `[["--disable-feature", "a"], ["--enable-feature", "b"], ["--set-feature-flags", "c=enable"]]`
+          # When `args` includes:
+          #   `[..., "--disable-feature", "a", "--enable-feature", "b", "--set-feature-flags", "c=enable", ...]`
+          # `feature_flag_sets` will be set to:
+          #   `[["--disable-feature", "a"], ["--enable-feature", "b"], ["--set-feature-flags", "c=enable"]]`
           # This will result in tests running three times, once with each feature flag option.
           while (index = args&.index { |x| x =~ /--.*-feature/ })
             feature_flag_sets << args.slice!(index, 2)

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

@@ -13,9 +13,9 @@ module Gitlab
 
         def self.release
           QA::Release.new(image)
-        rescue Support::InvalidResponseError => ex
-          warn ex.message
-          warn "#{ex.response.code} #{ex.response.message}: #{ex.response.body}"
+        rescue Support::InvalidResponseError => e
+          warn e.message
+          warn "#{e.response.code} #{e.response.message}: #{e.response.body}"
           exit 1
         end
 
@@ -81,7 +81,7 @@ module Gitlab
           end
 
           def api_get!
-            @response_body ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+            @response_body ||=
               begin
                 response = Support::GetRequest.new(uri, Runtime::Env.qa_access_token).execute!
                 JSON.parse(response.body)

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

@@ -43,7 +43,8 @@ module Gitlab
         #
         # @return [void]
         def prepare
-          @telegraf_config = File.open("#{Dir.mktmpdir(nil, ENV['CI_BUILDS_DIR'])}/telegraf.conf", 'w') do |file|
+          @telegraf_config = File.open("#{Dir.mktmpdir(nil, ENV.fetch('CI_BUILDS_DIR', nil))}/telegraf.conf",
+            'w') do |file|
             file.write(config)
             file.path
           end

data/lib/gitlab/qa/docker/engine.rb

@@ -18,7 +18,8 @@ module Gitlab
         end
 
         def login(username:, password:, registry:)
-          Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}), mask_secrets: password)
+          Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}),
+            mask_secrets: password)
         end
 
         def pull(image:, tag: nil, quiet: true)
@@ -63,7 +64,8 @@ module Gitlab
             Class.new do
               # @param file The name of the file
               # @param contents The content of the file to write
-              # @param expand_vars Set false if you need to write an environment variable '$' to a file. The variable should be escaped \\\$
+              # @param expand_vars Set false if you need to write an environment variable '$' to a file.
+              # The variable should be escaped \\\$
               def self.write(file, contents, expand_vars = true)
                 if expand_vars
                   %(echo "#{contents}" > #{file};)
@@ -82,7 +84,8 @@ module Gitlab
         def exec(name, command, mask_secrets: nil)
           cmd = ['exec']
           cmd << '--privileged' if privileged_command?(command)
-          Docker::Command.execute(%(#{cmd.join(' ')} #{name} bash -c "#{command.gsub('"', '\\"')}"), mask_secrets: mask_secrets)
+          Docker::Command.execute(%(#{cmd.join(' ')} #{name} bash -c "#{command.gsub('"', '\\"')}"),
+            mask_secrets: mask_secrets)
         end
 
         def read_file(image, tag, path, &block)

data/lib/gitlab/qa/docker/volumes.rb

@@ -20,7 +20,7 @@ module Gitlab
           # but Docker on macOS exposes /private and disallow exposing /var/
           # so we need to get the real tmpdir path
           Dir.mktmpdir('gitlab-qa-', File.realpath(Dir.tmpdir)).tap do |dir|
-            yield Hash[@volumes.map { |k, v| ["#{dir}/#{k}", v] }]
+            yield @volumes.transform_keys { |k| "#{dir}/#{k}" }
           end
         end
       end

data/lib/gitlab/qa/release.rb

@@ -11,7 +11,7 @@ module Gitlab
           (-qa)?
           (:(?<tag>.+))?
         \z
-      /xi.freeze
+      /xi
       CUSTOM_GITLAB_IMAGE_REGEX = %r{
         \A
           (?<image_without_tag>
@@ -23,7 +23,7 @@ module Gitlab
           (-qa)?
           (:(?<tag>.+))?
         \z
-      }xi.freeze
+      }xi
 
       delegate :ci_project_path, to: Gitlab::QA::Runtime::Env
 
@@ -39,7 +39,7 @@ module Gitlab
         \A
           (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee|jh)
         \z
-      /xi.freeze
+      /xi
 
       # Dev tag example:
       #  12.1.201906121026-325a6632895.b340d0bd35d
@@ -53,7 +53,7 @@ module Gitlab
         \A
           (?<version>\d+\.\d+(.\d+)?)\.(?<timestamp>\d+)-(?<gitlab_ref>[A-Za-z0-9]+)\.(?<omnibus_ref>[A-Za-z0-9]+)
         \z
-      /xi.freeze
+      /xi
 
       DEFAULT_TAG = 'latest'
       DEFAULT_CANONICAL_TAG = 'nightly'

data/lib/gitlab/qa/runner.rb

@@ -29,7 +29,8 @@ module Gitlab
             Runtime::Scenario.define(:teardown, false)
           end
 
-          opts.on('--no-tests', 'Orchestrates the docker containers but does not run the tests. Implies --no-teardown') do
+          opts.on('--no-tests',
+            'Orchestrates the docker containers but does not run the tests. Implies --no-teardown') do
             Runtime::Scenario.define(:run_tests, false)
             Runtime::Scenario.define(:teardown, false)
           end
@@ -42,7 +43,12 @@ module Gitlab
             Runtime::Scenario.define(:skip_server_hooks, true)
           end
 
-          opts.on('--qa-image QA_IMAGE', String, 'Specifies a QA image to be used instead of inferring it from the GitLab image. See Gitlab::QA::Release#qa_image') do |value|
+          opts.on(
+            '--qa-image QA_IMAGE',
+            String,
+            "Specifies a QA image to be used instead of inferring it from the GitLab image." \
+            "See Gitlab::QA::Release#qa_image"
+          ) do |value|
             Runtime::Scenario.define(:qa_image, value)
           end
 
@@ -58,7 +64,8 @@ module Gitlab
             end
           end
 
-          opts.on('--seed-db search_pattern1[,search_pattern2,...]', 'Seed application database with sample test data') do |file_pattern|
+          opts.on('--seed-db search_pattern1[,search_pattern2,...]',
+            'Seed application database with sample test data') do |file_pattern|
             file_pattern.split(',').each do |pattern|
               @seed_scripts << pattern
             end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'securerandom'
 
@@ -22,12 +23,12 @@ module Gitlab
           'QA_REMOTE_MOBILE_DEVICE_NAME' => :remote_mobile_device_name,
           'QA_REMOTE_TUNNEL_ID' => :remote_tunnel_id,
           'QA_BROWSER' => :browser,
-          'QA_BROWSER_VERSION' => :browser_version,
+          'QA_SELENOID_BROWSER_VERSION' => :selenoid_browser_version,
           'QA_RECORD_VIDEO' => :record_video,
           'QA_LAYOUT' => :layout,
           'QA_VIDEO_RECORDER_IMAGE' => :video_recorder_image,
           'QA_VIDEO_RECORDER_VERSION' => :video_recorder_version,
-          'QA_BROWSER_IMAGE' => :browser_image,
+          'QA_SELENOID_BROWSER_IMAGE' => :selenoid_browser_image,
           'QA_ADDITIONAL_REPOSITORY_STORAGE' => :qa_additional_repository_storage,
           'QA_PRAEFECT_REPOSITORY_STORAGE' => :qa_praefect_repository_storage,
           'QA_GITALY_NON_CLUSTER_STORAGE' => :qa_gitaly_non_cluster_storage,
@@ -89,6 +90,7 @@ module Gitlab
           'RSPEC_SKIPPED_TESTS_REPORT_PATH' => :skipped_tests_report_path,
           'CI' => :ci,
           'CI_JOB_NAME' => :ci_job_name,
+          'CI_JOB_NAME_SLUG' => :ci_job_name_slug,
           'CI_JOB_URL' => :ci_job_url,
           'CI_JOB_TOKEN' => :ci_job_token,
           'CI_RUNNER_ID' => :ci_runner_id,
@@ -156,9 +158,7 @@ module Gitlab
           attr_writer(method_name)
 
           define_method(method_name) do
-            env_var_value_if_defined(env_name) || (if instance_variable_defined?("@#{method_name}")
-                                                     instance_variable_get("@#{method_name}")
-                                                   end)
+            env_var_value_if_defined(env_name) || (instance_variable_get("@#{method_name}") if instance_variable_defined?("@#{method_name}"))
           end
         end
 
@@ -169,7 +169,7 @@ module Gitlab
             value = env_var_name_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
             vars[name] = value if value
           end
-          qa_variables = ENV.each_with_object({}) do |(name, value), vars|
+          qa_variables = ENV.each_with_object({}) do |(name, _value), vars|
             next unless name.start_with?('QA_')
 
             var_name = env_var_name_if_defined(name)
@@ -180,7 +180,7 @@ module Gitlab
         end
 
         def debug?
-          enabled?(ENV['QA_DEBUG'], default: true)
+          enabled?(ENV.fetch('QA_DEBUG', nil), default: true)
         end
 
         def log_level
@@ -208,7 +208,7 @@ module Gitlab
         end
 
         def colorized_logs?
-          enabled?(ENV['COLORIZED_LOGS'], default: false)
+          enabled?(ENV.fetch('COLORIZED_LOGS', nil), default: false)
         end
 
         def dev_access_token_variable
@@ -265,32 +265,30 @@ module Gitlab
 
         def require_aws_s3_environment!
           %w[AWS_S3_REGION AWS_S3_KEY_ID AWS_S3_ACCESS_KEY AWS_S3_BUCKET_NAME].each do |env_key|
-            unless ENV.key?(env_key)
-              raise ArgumentError, "Environment variable #{env_key} must be set to run AWS S3 object storage specs"
-            end
+            raise ArgumentError, "Environment variable #{env_key} must be set to run AWS S3 object storage specs" unless ENV.key?(env_key)
           end
         end
 
         def require_gcs_environment!
           %w[GOOGLE_PROJECT GOOGLE_CLIENT_EMAIL GOOGLE_JSON_KEY GCS_BUCKET_NAME].each do |env_key|
-            unless ENV.key?(env_key)
-              raise ArgumentError, "Environment variable #{env_key} must be set to run GCS object storage specs"
-            end
+            raise ArgumentError, "Environment variable #{env_key} must be set to run GCS object storage specs" unless ENV.key?(env_key)
           end
         end
 
         def require_gcs_with_cdn_environment!
-          %w[GOOGLE_CDN_JSON_KEY GCS_CDN_BUCKET_NAME GOOGLE_CDN_LB GOOGLE_CDN_SIGNURL_KEY GOOGLE_CDN_SIGNURL_KEY_NAME].each do |env_key|
-            unless ENV.key?(env_key)
-              raise ArgumentError, "Environment variable #{env_key} must be set to run GCS with CDN enabled scenario"
-            end
+          %w[GOOGLE_CDN_JSON_KEY GCS_CDN_BUCKET_NAME GOOGLE_CDN_LB GOOGLE_CDN_SIGNURL_KEY
+            GOOGLE_CDN_SIGNURL_KEY_NAME].each do |env_key|
+            raise ArgumentError, "Environment variable #{env_key} must be set to run GCS with CDN enabled scenario" unless ENV.key?(env_key)
           end
         end
 
         def require_oauth_environment!
           %w[QA_GITHUB_OAUTH_APP_ID QA_GITHUB_OAUTH_APP_SECRET QA_GITHUB_USERNAME
-             QA_GITHUB_PASSWORD QA_1P_EMAIL QA_1P_PASSWORD QA_1P_SECRET QA_1P_GITHUB_UUID].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run OAuth specs" unless ENV.key?(env_key)
+            QA_GITHUB_PASSWORD QA_1P_EMAIL QA_1P_PASSWORD QA_1P_SECRET QA_1P_GITHUB_UUID].each do |env_key|
+            unless ENV.key?(env_key)
+              raise ArgumentError,
+                "Environment variable #{env_key} must be set to run OAuth specs"
+            end
           end
         end
 
@@ -342,12 +340,12 @@ module Gitlab
           env_var_value_if_defined('QA_VIDEO_RECORDER_VERSION') || 'latest'
         end
 
-        def browser_image
-          env_var_value_if_defined('QA_BROWSER_IMAGE') || 'selenoid/chrome'
+        def selenoid_browser_image
+          env_var_value_if_defined('QA_SELENOID_BROWSER_IMAGE') || 'selenoid/chrome'
         end
 
-        def browser_version
-          env_var_value_if_defined('QA_BROWSER_VERSION') || '111.0'
+        def selenoid_browser_version
+          env_var_value_if_defined('QA_SELENOID_BROWSER_VERSION') || '111.0'
         end
 
         def qa_run_type
@@ -440,7 +438,7 @@ module Gitlab
         end
 
         def env_var_value_if_defined(variable)
-          return ENV[variable] if env_var_value_valid?(variable)
+          return ENV.fetch(variable, nil) if env_var_value_valid?(variable)
         end
 
         def env_var_name_if_defined(variable)

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

@@ -14,7 +14,7 @@ module Gitlab
         def self.logger
           @logger ||= begin
             log_path = Env.log_path
-            ::FileUtils.mkdir_p(log_path) unless File.exist?(log_path)
+            ::FileUtils.mkdir_p(log_path)
 
             TestLogger.logger(level: Env.log_level, path: log_path)
           end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'active_support'
 require 'active_support/core_ext/object/blank'
 
 module Gitlab

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'tempfile'
 
 module Gitlab
@@ -26,7 +27,7 @@ module Gitlab
           end
 
           def setup_json_key
-            Tempfile.open('gcs-json-key', ENV['CI_PROJECT_DIR']) do |file|
+            Tempfile.open('gcs-json-key', ENV.fetch('CI_PROJECT_DIR', nil)) do |file|
               file.write(ENV.fetch('GOOGLE_JSON_KEY'))
 
               file

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

@@ -18,18 +18,14 @@ module Gitlab
 
           define_singleton_method(attribute) do
             attributes[attribute.to_sym].tap do |value|
-              if value.to_s.empty?
-                raise ArgumentError, "Empty `#{attribute}` attribute!"
-              end
+              raise ArgumentError, "Empty `#{attribute}` attribute!" if value.to_s.empty?
             end
           end
         end
 
-        # rubocop:disable Style/MethodMissing
         def method_missing(name, *)
           raise ArgumentError, "Scenario attribute `#{name}` not defined!"
         end
-        # rubocop:enable Style/MethodMissing
       end
     end
   end

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

@@ -4,8 +4,8 @@ module Gitlab
   module QA
     module Scenario
       module Actable
-        def act(*args, &block)
-          instance_exec(*args, &block)
+        def act(...)
+          instance_exec(...)
         end
 
         def self.included(base)
@@ -17,8 +17,8 @@ module Gitlab
             yield new if block_given?
           end
 
-          def act(*args, &block)
-            new.act(*args, &block)
+          def act(...)
+            new.act(...)
           end
         end
       end

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

@@ -80,10 +80,10 @@ module Gitlab
                 iptables -A OUTPUT -p tcp -m tcp --sport 80 -m state --state NEW,ESTABLISHED -j ACCEPT
                 iptables -A INPUT -p tcp -m tcp --dport 80 -m state --state NEW,ESTABLISHED -j ACCEPT
 
-                # some exceptions to allow runners access network https://gitlab.com/gitlab-org/gitlab-qa/-/issues/700 
+                # some exceptions to allow runners access network https://gitlab.com/gitlab-org/gitlab-qa/-/issues/700#{' '}
                 iptables -A OUTPUT -p tcp -d  #{gitlab_registry_ip} -j ACCEPT
                 iptables -A OUTPUT -p tcp -d  #{dev_gitlab_registry_ip} -j ACCEPT
-                # allow access to praefect node 
+                # allow access to praefect node#{' '}
                 iptables -A OUTPUT -p tcp -d #{praefect_ip} -j ACCEPT
 
                 # Should now fail to ping gitlab_ip, port 22/80 should be open

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

@@ -37,7 +37,8 @@ module Gitlab
             end
 
             def deployment_component
-              raise NotImplementedError, 'Please define the Component for the deployment environment associated with this scenario.'
+              raise NotImplementedError,
+                'Please define the Component for the deployment environment associated with this scenario.'
             end
           end
         end

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

@@ -18,7 +18,7 @@ module Gitlab
               raise ArgumentError, 'Group SAML is EE only feature!' unless release.ee?
             end
 
-            def configure(gitlab, saml)
+            def configure(gitlab, _saml)
               gitlab.omnibus_configuration << <<~OMNIBUS
                 gitlab_rails['omniauth_enabled'] = true;
                 gitlab_rails['omniauth_providers'] = [{ name: 'group_saml' }];

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

@@ -66,16 +66,14 @@ module Gitlab
               end
             end
 
-            def orchestrate_ldap
+            def orchestrate_ldap(&block)
               Component::LDAP.perform do |ldap|
                 ldap.name = 'ldap-server'
                 ldap.network = 'test'
                 ldap.set_gitlab_credentials
                 ldap.tls = tls
 
-                ldap.instance do
-                  yield
-                end
+                ldap.instance(&block)
               end
             end
 
@@ -90,8 +88,9 @@ module Gitlab
                 if orchestrate_ldap_server
                   orchestrate_ldap { run_specs(gitlab, {}, *rspec_args) }
                 else
-                  volumes = { 'admin': File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'qa/fixtures/ldap/admin'),
-                              'non_admin': File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'qa/fixtures/ldap/non_admin') }
+                  volumes = { admin: File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'qa/fixtures/ldap/admin'),
+                              non_admin: File.join(Docker::Volumes::QA_CONTAINER_WORKDIR,
+                                'qa/fixtures/ldap/non_admin') }
                   run_specs(gitlab, volumes, *rspec_args)
                 end
               end

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

@@ -11,7 +11,7 @@ module Gitlab
             attr_reader :gitlab_name
 
             def initialize
-              @gitlab_name = 'gitlab-oauth'
+              @gitlab_name = 'gitlab'
             end
 
             def perform(release, *rspec_args)
@@ -23,8 +23,9 @@ module Gitlab
                 gitlab.release = release
                 gitlab.network = 'test'
                 gitlab.name = gitlab_name
+                gitlab.tls = true
 
-                gitlab.omnibus_configuration << gitlab_omnibus_configuration
+                gitlab.omnibus_configuration << gitlab_omnibus_configuration(gitlab.address)
 
                 gitlab.instance do
                   Runtime::Logger.info('Running OAuth specs!')
@@ -43,7 +44,7 @@ module Gitlab
 
             private
 
-            def gitlab_omnibus_configuration
+            def gitlab_omnibus_configuration(gitlab_address)
               <<~OMNIBUS
                 gitlab_rails['omniauth_enabled'] = true;
                 gitlab_rails['omniauth_allow_single_sign_on'] = ['github'];
@@ -58,6 +59,8 @@ module Gitlab
                     args: { scope: 'user:email' }
                   }
                 ];
+                letsencrypt['enable'] = false;
+                external_url '#{gitlab_address}';
               OMNIBUS
             end
           end

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

@@ -32,6 +32,9 @@ module Gitlab
                     specs.network = gitlab.network
                     specs.args = [gitlab.address, *rspec_args]
                   end
+                ensure
+                  gitlab.delete_key_file(sign_url_key_path)
+                  gitlab.delete_key_file(cdn_gcloud_path)
                 end
               end
             end

data/lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb

@@ -115,7 +115,7 @@ module Gitlab
             # @param [Gitlab::QA::Release] release
             # @return [Boolean]
             def run_specs?(release)
-              [upgrade_path.first, current_release].any? { |rel| rel == release }
+              [upgrade_path.first, current_release].any?(release)
             end
           end
         end

data/lib/gitlab/qa/scenario/test/omnibus/upgrade.rb

@@ -12,9 +12,7 @@ module Gitlab
             def perform(image = 'CE', *rspec_args)
               ce_release = QA::Release.new(image)
 
-              if ce_release.ee?
-                raise ArgumentError, 'Only CE can be upgraded to EE!'
-              end
+              raise ArgumentError, 'Only CE can be upgraded to EE!' if ce_release.ee?
 
               Docker::Volumes.new.with_temporary_volumes do |volumes|
                 Scenario::Test::Instance::Image