gitlab-qa 10.3.0 → 12.2.1

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,17 @@ module Gitlab
           'QA_REMOTE_MOBILE_DEVICE_NAME' => :remote_mobile_device_name,
           'QA_REMOTE_TUNNEL_ID' => :remote_tunnel_id,
           'QA_BROWSER' => :browser,
+          '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_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,
           'QA_COOKIES' => :qa_cookie,
           'QA_DEBUG' => :qa_debug,
-          'QA_DEFAULT_BRANCH' => :qa_default_branch,
           'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
           'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
           'QA_CAN_TEST_PRAEFECT' => :qa_can_test_praefect,
@@ -42,7 +48,6 @@ module Gitlab
           'QA_SKIP_PULL' => :qa_skip_pull,
           'QA_VALIDATE_RESOURCE_REUSE' => :qa_validate_resource_reuse,
           'WEBDRIVER_HEADLESS' => :webdriver_headless,
-          'GITLAB_API_BASE' => :api_base,
           'GITLAB_ADMIN_USERNAME' => :admin_username,
           'GITLAB_ADMIN_PASSWORD' => :admin_password,
           'GITLAB_USERNAME' => :user_username,
@@ -57,7 +62,6 @@ module Gitlab
           'GITLAB_QA_ADMIN_ACCESS_TOKEN' => :qa_admin_access_token,
           'GITLAB_QA_DEV_ACCESS_TOKEN' => :qa_dev_access_token,
           'GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN' => :qa_container_registry_access_token,
-          'GITLAB_QA_ISSUE_URL' => :qa_issue_url,
           'GITHUB_ACCESS_TOKEN' => :github_access_token,
           'GITLAB_URL' => :gitlab_url,
           'SIMPLE_SAML_HOSTNAME' => :simple_saml_hostname,
@@ -69,22 +73,26 @@ module Gitlab
           'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
           'GCLOUD_REGION' => :gcloud_region,
           'SIGNUP_DISABLED' => :signup_disabled,
-          'GITLAB_CI_API_TOKEN' => :gitlab_ci_api_token,
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
           'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
           'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
           'GITLAB_QA_PASSWORD_2' => :gitlab_qa_password_2,
           'QA_GITHUB_USERNAME' => :qa_github_username,
           'QA_GITHUB_PASSWORD' => :qa_github_password,
+          'QA_FACEBOOK_USERNAME' => :qa_facebook_username,
+          'QA_FACEBOOK_PASSWORD' => :qa_facebook_password,
           'KNAPSACK_GENERATE_REPORT' => :knapsack_generate_report,
           'KNAPSACK_REPORT_PATH' => :knapsack_report_path,
           'KNAPSACK_TEST_FILE_PATTERN' => :knapsack_test_file_pattern,
           'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
           'QA_KNAPSACK_REPORT_GCS_CREDENTIALS' => :qa_knapsack_report_gcs_credentials,
           'QA_KNAPSACK_REPORT_PATH' => :qa_knapsack_report_path,
+          'QA_RSPEC_REPORT_PATH' => :qa_rspec_report_path,
+          'RSPEC_FAST_QUARANTINE_PATH' => :rspec_fast_quarantine_path,
+          'RSPEC_SKIPPED_TESTS_REPORT_PATH' => :skipped_tests_report_path,
           'CI' => :ci,
-          'CI_COMMIT_REF_NAME' => :ci_commit_ref_name,
           '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,
@@ -92,22 +100,16 @@ module Gitlab
           'CI_SERVER_PERSONAL_ACCESS_TOKEN' => :ci_server_personal_access_token,
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
-          'CI_PROJECT_ID' => :ci_project_id,
           'CI_PROJECT_NAME' => :ci_project_name,
           'CI_PROJECT_PATH' => :ci_project_path,
-          'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
-          'CI_PIPELINE_ID' => :ci_pipeline_id,
           'CI_PIPELINE_SOURCE' => :ci_pipeline_source,
           'CI_PIPELINE_URL' => :ci_pipeline_url,
           'CI_PIPELINE_CREATED_AT' => :ci_pipeline_created_at,
           'CI_MERGE_REQUEST_IID' => :ci_merge_request_iid,
-          'CI_API_V4_URL' => :ci_api_v4_url,
           'GITLAB_CI' => :gitlab_ci,
           'ELASTIC_URL' => :elastic_url,
           'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
           'MAILHOG_HOSTNAME' => :mailhog_hostname,
-          'SLACK_QA_CHANNEL' => :slack_qa_channel,
-          'SLACK_ICON_EMOJI' => :slack_icon_emoji,
           'GITLAB_QA_FORMLESS_LOGIN_TOKEN' => :gitlab_qa_formless_login_token,
           'GEO_MAX_FILE_REPLICATION_TIME' => :geo_max_file_replication_time,
           'GEO_MAX_DB_REPLICATION_TIME' => :geo_max_db_replication_time,
@@ -115,7 +117,6 @@ module Gitlab
           'JIRA_ADMIN_USERNAME' => :jira_admin_username,
           'JIRA_ADMIN_PASSWORD' => :jira_admin_password,
           'CACHE_NAMESPACE_NAME' => :cache_namespace_name,
-          'DEPLOY_VERSION' => :deploy_version,
           'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
           'GEO_FAILOVER' => :geo_failover,
           'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password,
@@ -142,6 +143,8 @@ module Gitlab
           'JH_ENV' => :jh_env,
           'QA_GITHUB_OAUTH_APP_ID' => :github_oauth_app_id,
           'QA_GITHUB_OAUTH_APP_SECRET' => :github_oauth_app_secret,
+          'QA_FACEBOOK_OAUTH_APP_ID' => :facebook_oauth_app_id,
+          'QA_FACEBOOK_OAUTH_APP_SECRET' => :facebook_oauth_app_secret,
           'QA_1P_EMAIL' => :qa_1p_email,
           'QA_1P_PASSWORD' => :qa_1p_password,
           'QA_1P_SECRET' => :qa_1p_secret,
@@ -151,16 +154,15 @@ module Gitlab
           'RELEASE_REGISTRY_USERNAME' => :release_registry_username,
           'RELEASE_REGISTRY_PASSWORD' => :release_registry_password,
           'SELENOID_DIRECTORY' => :selenoid_directory,
-          'USE_SELENOID' => :use_selenoid
+          'USE_SELENOID' => :use_selenoid,
+          'SCHEDULE_TYPE' => :schedule_type
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
           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
 
@@ -171,7 +173,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)
@@ -182,7 +184,7 @@ module Gitlab
         end
 
         def debug?
-          enabled?(ENV['QA_DEBUG'], default: true)
+          enabled?(ENV.fetch('QA_DEBUG', nil), default: true)
         end
 
         def log_level
@@ -193,10 +195,6 @@ module Gitlab
           env_var_value_if_defined('QA_LOG_PATH') || host_artifacts_dir
         end
 
-        def default_branch
-          env_var_value_if_defined('QA_DEFAULT_BRANCH') || 'main'
-        end
-
         def gitlab_availability_timeout
           (env_var_value_if_defined('GITLAB_QA_AVAILABILITY_TIMEOUT') || 360).to_i
         end
@@ -209,20 +207,12 @@ module Gitlab
           env_var_value_if_defined('GITLAB_DEV_USERNAME') || 'gitlab-qa-bot'
         end
 
-        def gitlab_api_base
-          env_var_value_if_defined('GITLAB_API_BASE') || 'https://gitlab.com/api/v4'
-        end
-
-        def pipeline_from_project_name
-          ci_project_name.to_s.start_with?('gitlab') ? QA::Runtime::Env.default_branch : ci_project_name
-        end
-
         def run_id
           @run_id ||= "gitlab-qa-run-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}-#{SecureRandom.hex(4)}"
         end
 
         def colorized_logs?
-          enabled?(ENV['COLORIZED_LOGS'], default: false)
+          enabled?(ENV.fetch('COLORIZED_LOGS', nil), default: false)
         end
 
         def dev_access_token_variable
@@ -233,10 +223,6 @@ module Gitlab
           env_var_value_if_defined('GITLAB_INITIAL_ROOT_PASSWORD') || '5iveL!fe'
         end
 
-        def deploy_environment
-          env_var_value_if_defined('DEPLOY_ENVIRONMENT') || pipeline_from_project_name
-        end
-
         def host_artifacts_dir
           @host_artifacts_dir ||= File.join(
             env_var_value_if_defined('QA_ARTIFACTS_DIR') || '/tmp/gitlab-qa', Runtime::Env.run_id
@@ -275,18 +261,6 @@ module Gitlab
           raise ArgumentError, "Please provide GITLAB_QA_DEV_ACCESS_TOKEN"
         end
 
-        def require_slack_qa_channel!
-          return unless env_var_value_if_defined('SLACK_QA_CHANNEL').to_s.strip.empty?
-
-          raise ArgumentError, "Please provide SLACK_QA_CHANNEL"
-        end
-
-        def require_ci_slack_webhook_url!
-          return unless env_var_value_if_defined('CI_SLACK_WEBHOOK_URL').to_s.strip.empty?
-
-          raise ArgumentError, "Please provide CI_SLACK_WEBHOOK_URL"
-        end
-
         def require_qa_container_registry_access_token!
           return unless env_var_value_if_defined('GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN').to_s.strip.empty?
 
@@ -295,32 +269,31 @@ 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 QA_FACEBOOK_USERNAME
+            QA_FACEBOOK_PASSWORD QA_FACEBOOK_OAUTH_APP_SECRET QA_FACEBOOK_OAUTH_APP_ID].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
 
@@ -364,8 +337,20 @@ module Gitlab
           env_var_value_if_defined('QA_LAYOUT')&.match?(/tablet|phone/i)
         end
 
-        def browser_version
-          env_var_value_if_defined('QA_BROWSER_VERSION')
+        def video_recorder_image
+          env_var_value_if_defined('QA_VIDEO_RECORDER_IMAGE') || 'presidenten/selenoid-manual-video-recorder'
+        end
+
+        def video_recorder_version
+          env_var_value_if_defined('QA_VIDEO_RECORDER_VERSION') || 'latest'
+        end
+
+        def selenoid_browser_image
+          env_var_value_if_defined('QA_SELENOID_BROWSER_IMAGE') || 'selenoid/chrome'
+        end
+
+        def selenoid_browser_version
+          env_var_value_if_defined('QA_SELENOID_BROWSER_VERSION') || '111.0'
         end
 
         def qa_run_type
@@ -458,7 +443,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/decomposition_single_db.rb

@@ -8,8 +8,7 @@ module Gitlab
           def configuration
             <<~OMNIBUS
               gitlab_rails['databases']['main']['enable'] = true
-              gitlab_rails['databases']['ci']['enable'] = true
-              gitlab_rails['databases']['ci']['db_database'] = 'gitlabhq_production'
+              gitlab_rails['databases']['ci']['enable'] = false
             OMNIBUS
           end
         end

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
@@ -130,8 +130,6 @@ module Gitlab
                     ]
                   }
                 ];
-                grafana['disable_login_form'] = false;
-                grafana['admin_password'] = 'GRAFANA_ADMIN_PASSWORD';
               OMNIBUS
             end
           end

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/gitaly_cluster.rb

@@ -79,8 +79,6 @@ module Gitlab
                     ]
                   }
                 ];
-                grafana['disable_login_form'] = false;
-                grafana['admin_password'] = 'GRAFANA_ADMIN_PASSWORD';
               OMNIBUS
             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/mtls.rb

@@ -87,17 +87,32 @@ module Gitlab
 
             def gitaly_omnibus
               <<~OMNIBUS
-                gitaly['tls_listen_addr'] = '0.0.0.0:9999';
-                gitaly['certificate_path'] = '/etc/gitlab/ssl/gitaly.test.crt';
-                gitaly['key_path'] = '/etc/gitlab/ssl/gitaly.test.key';
-
+                gitaly['configuration'] = {
+                  auth: {
+                    token: 'abc123secret',
+                  },
+                  tls_listen_addr: '0.0.0.0:9999',
+                  tls: {
+                    certificate_path: '/etc/gitlab/ssl/gitaly.test.crt',
+                    key_path: '/etc/gitlab/ssl/gitaly.test.key',
+                  },
+                  storage: [
+                    {
+                      name: 'default',
+                      path: '/var/opt/gitlab/git-data/repositories',
+                    },
+                    {
+                      name: 'storage1',
+                      path: '/mnt/gitlab/git-data/repositories',
+                    },
+                  ],
+                };
                 postgresql['enable'] = false;
                 redis['enable'] = false;
                 nginx['enable'] = false;
                 puma['enable'] = false;
                 sidekiq['enable'] = false;
                 gitlab_workhorse['enable'] = false;
-                grafana['enable'] = false;
                 gitlab_exporter['enable'] = false;
                 alertmanager['enable'] = false;
                 prometheus['enable'] = false;
@@ -105,7 +120,6 @@ module Gitlab
                 gitlab_rails['rake_cache_clear'] = false;
                 gitlab_rails['auto_migrate'] = false;
 
-                gitaly['auth_token'] = 'abc123secret';
                 gitlab_shell['secret_token'] = 'shellsecret';
 
                 gitlab_rails['internal_api_url'] = 'https://#{@gitlab_name}.#{@network}';

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,10 +44,10 @@ 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'];
+                gitlab_rails['omniauth_allow_single_sign_on'] = ['github', 'facebook'];
                 gitlab_rails['omniauth_block_auto_created_users'] = false;
                 gitlab_rails['omniauth_providers'] = [
                   {
@@ -56,8 +57,16 @@ module Gitlab
                     url: 'https://github.com/',
                     verify_ssl: false,
                     args: { scope: 'user:email' }
+                  },
+                  {
+                    name: 'facebook',
+                    app_id: '$QA_FACEBOOK_OAUTH_APP_ID',
+                    app_secret: '$QA_FACEBOOK_OAUTH_APP_SECRET',
+                    verify_ssl: false
                   }
                 ];
+                letsencrypt['enable'] = false;
+                external_url '#{gitlab_address}';
               OMNIBUS
             end
           end

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

@@ -30,14 +30,22 @@ module Gitlab
                   }
                 });
                 gitaly['enable'] = true;
-                gitaly['listen_addr'] = '0.0.0.0:8075';
-                gitaly['auth_token'] = 'secret-token';
-                gitaly['storage'] = [
-                  {
-                    'name' => 'gitaly',
-                    'path' => '/var/opt/gitlab/git-data/repositories'
-                  }
-                ];
+                gitaly['configuration'] = {
+                  auth: {
+                    token: 'secret-token',
+                  },
+                  listen_addr: '0.0.0.0:8075',
+                  tls: {
+                    certificate_path: '/etc/gitlab/ssl/gitaly.test.crt',
+                    key_path: '/etc/gitlab/ssl/gitaly.test.key',
+                  },
+                  storage: [
+                    {
+                      name: 'gitaly',
+                      path: '/var/opt/gitlab/git-data/repositories',
+                    },
+                  ],
+                };
                 gitlab_rails['gitaly_token'] = 'secret-token';
                 gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
                 prometheus['scrape_configs'] = [
@@ -60,8 +68,6 @@ module Gitlab
                     ]
                   }
                 ];
-                grafana['disable_login_form'] = false;
-                grafana['admin_password'] = 'GRAFANA_ADMIN_PASSWORD';
               OMNIBUS
             end
           end

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

@@ -14,8 +14,8 @@ module Gitlab
                 gitlab.network = 'test'
                 gitlab.name = 'gitlab'
                 gitlab.seed_admin_token = false
-                sign_url_key_path = gitlab.copy_key_file('GOOGLE_CDN_SIGNURL_KEY')
-                cdn_gcloud_path = gitlab.copy_key_file('GOOGLE_CDN_JSON_KEY')
+                sign_url_key_path = gitlab.create_key_file('GOOGLE_CDN_SIGNURL_KEY')
+                cdn_gcloud_path = gitlab.create_key_file('GOOGLE_CDN_JSON_KEY')
 
                 gitlab.omnibus_configuration << <<~OMNIBUS
                   external_url 'http://#{gitlab.name}.#{gitlab.network}';
@@ -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

data/lib/gitlab/qa/scenario/test/sanity/version.rb

@@ -71,7 +71,7 @@ module Gitlab
             end
 
             def commit_within_hours?(commit_time_string, hours)
-              Time.at(Time.parse(commit_time_string).utc).to_datetime > Time.at((Time.now - hours * 60 * 60).utc).to_datetime
+              Time.at(Time.parse(commit_time_string).utc).to_datetime > Time.at((Time.now - (hours * 60 * 60)).utc).to_datetime
             end
 
             def api_commit_detail(host, project, sha)

data/lib/gitlab/qa/support/config_scripts.rb

@@ -10,7 +10,7 @@ module Gitlab
           global_server_prereceive_hook = <<~SCRIPT
             #!/usr/bin/env bash
 
-            if [[ \\\$GL_PROJECT_PATH =~ 'reject-prereceive' ]]; then
+            if [[ \\$GL_PROJECT_PATH =~ 'reject-prereceive' ]]; then
               echo 'GL-HOOK-ERR: Custom error message rejecting prereceive hook for projects with GL_PROJECT_PATH matching pattern reject-prereceive'
               exit 1
             fi