gitlab-qa 7.8.1 → 7.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d5db8c8b0acf394172a0def237d3049c42c04a811204589d6052fb3fda32eb2
-  data.tar.gz: ae97cccc20dce22ce593a1d5a9690d6375b68fcd8ca1d2c4f854803c92dc17d2
+  metadata.gz: 75ab48c7d1d2eba818e59d14fdf90a781faf6af477c5993f2ebe27296be785bd
+  data.tar.gz: bc2614ee2f780463fc21360b2e28885227bfe251e8dd5592657feb6b605fc264
 SHA512:
-  metadata.gz: 9f13f3e88a045994996a2664e0efedc7dadac3ac53e7cd52b0338cf95b33224bd28d92dbe1909dd0ba66f60b4de1b41dd407c1fd1604b72b295c9368a8526710
-  data.tar.gz: aed74598a8cb77c86822ceb2dc457641e4092aa764dba0bbcb3cd281d4a85abe329a8ecda6670e325655afd0470730b9e7699f5be5b0517dec66866f7adcca04
+  metadata.gz: 16de17dbf4a4c463fcc185e2432297b597a1d6704f02073010be159dc9994739b20d4733038721011fd1051918589c0cd93d3922d663cc3e3c4dd81545e2e4b0
+  data.tar.gz: 3208f2280f9d00c45e051e1bc2894dfbd9df989e7430931d5375054a79499c67c07f95b66dcee6a066ed9019c613cf6d976fa97ef35596c9e2459c43363c7023

data/.gitlab-ci.yml

@@ -158,6 +158,7 @@ rspec:
 ce:sanity-framework:
   variables:
     QA_GENERATE_ALLURE_REPORT: "false"
+    QA_EXPORT_TEST_METRICS: "false"
   script:
     - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure"
   extends:
@@ -168,6 +169,7 @@ ce:sanity-framework:
 ee:sanity-framework:
   variables:
     QA_GENERATE_ALLURE_REPORT: "false"
+    QA_EXPORT_TEST_METRICS: "false"
   script:
     - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag framework" 1 "2 examples, 1 failure"
   extends:
@@ -680,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/docs/what_tests_can_be_run.md

@@ -74,6 +74,10 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_SLOW_CONNECTION_THROUGHPUT_KBPS` | `32` | The maximum throughput (in kbps) of the simulated slow connection. | No|
 | `QA_SKIP_PULL` | `false` | Set to `true` to skip pulling docker images (e.g., to use one you built locally). | No|
 | `QA_GENERATE_ALLURE_REPORT` | `false` | When running on CI, set to `true` to generate allure reports | No|
+| `QA_EXPORT_TEST_METRICS` | `true` | When running on CI, set to `true` to export test metrics to influxdb | No|
+| `QA_INFLUXDB_URL` |- | Influxdb url for test metrics reporting | No|
+| `QA_INFLUXDB_TOKEN` |- | Influxdb token for test metrics reporting | No|
+| `QA_RUN_TYPE` |- | QA run type like `staging-full`, `canary`, `production` etc. Used in test metrics reporting | No|
 | `GITHUB_USERNAME` |-  | Username for authenticating with GitHub. | No|
 | `GITHUB_PASSWORD` |-  | Password for authenticating with GitHub. | No|
 | `GITLAB_QA_LOOP_RUNNER_MINUTES` | `1` | Minutes to run and repeat a spec while using the '--loop' option; default value is 1 minute. | No|

data/lib/gitlab/qa/report/results_in_issues.rb

@@ -19,6 +19,8 @@ module Gitlab
             puts "Reporting tests in #{test_results.path}"
 
             test_results.each do |test|
+              puts "Reporting test: #{test.file} | #{test.name}\n"
+
               report_test(test) unless test.skipped
             end
 
@@ -27,19 +29,18 @@ module Gitlab
         end
 
         def report_test(test)
-          puts "Reporting test: #{test.file} | #{test.name}"
-
           testcase = find_testcase(test) || create_testcase(test)
           test.testcase ||= testcase.web_url.sub('/issues/', '/quality/test_cases/')
 
-          issue = find_issue_by_iid(testcase, test)
+          issue = find_linked_results_issue_by_iid(testcase, test)
 
-          unless issue
+          if issue
+            issue = update_issue_title(issue, test, 'issue') if issue.title.strip != title_from_test(test)
+          else
             puts "No valid issue link found"
-            issue = find_or_create_issue(test)
+            issue = find_or_create_results_issue(test)
 
             add_issue_to_testcase(testcase, issue)
-            puts "Added issue #{issue.web_url} to testcase #{testcase.web_url}"
           end
 
           update_labels(testcase, test)
@@ -47,18 +48,47 @@ module Gitlab
         end
 
         def find_testcase(test)
-          iid = iid_from_testcase_url(test.testcase)
+          testcase = find_testcase_by_iid(test)
+
+          if testcase
+            testcase = update_issue_title(testcase, test, 'test_case') if testcase.title.strip != title_from_test(test)
+          else
+            testcase = find_issue(test, 'test_case')
+          end
+
+          testcase
+        end
+
+        def find_testcase_by_iid(test)
+          iid = testcase_iid_from_url(test.testcase)
 
-          testcases = search_issues(test: test, issue_type: 'test_case', iid: iid)
+          return unless iid
+
+          find_issue_by_iid(iid, 'test_case')
+        end
+
+        def find_linked_results_issue_by_iid(testcase, test)
+          iid = issue_iid_from_testcase(testcase)
 
-          if iid && testcases.blank?
-            warn(%(Test case url "#{test.testcase}" not valid))
-            testcases = search_issues(test: test, issue_type: 'test_case')
+          return unless iid
+
+          find_issue_by_iid(iid, 'issue')
+        end
+
+        def find_issue_by_iid(iid, issue_type)
+          issues = gitlab.find_issues(iid: iid) do |issue|
+            issue.state == 'opened' && issue.issue_type == issue_type
           end
 
-          warn(%(Too many test cases found with the file path "#{test.file}" and name "#{test.name}")) if testcases&.many?
+          warn(%(#{issue_type} iid "#{iid}" not valid)) if issues.empty?
 
-          testcases.first
+          issues.first
+        end
+
+        def update_issue_title(issue, test, issue_type)
+          warn(%(#{issue_type} title needs to be updated from '#{issue.title.strip}' to '#{title_from_test(test)}'))
+
+          gitlab.edit_issue(iid: issue.iid, options: { title: title_from_test(test) })
         end
 
         def create_testcase(test)
@@ -73,7 +103,7 @@ module Gitlab
           )
         end
 
-        def iid_from_testcase_url(url)
+        def testcase_iid_from_url(url)
           return warn(%(\nPlease update #{url} to test case url")) if url&.include?('/-/issues/')
 
           url && url.split('/').last.to_i
@@ -93,7 +123,7 @@ module Gitlab
           issue_iid&.to_i
         end
 
-        def find_or_create_issue(test)
+        def find_or_create_results_issue(test)
           issue = find_issue(test, 'issue')
 
           if issue
@@ -106,22 +136,12 @@ module Gitlab
           issue
         end
 
-        def find_issue_by_iid(testcase, test)
-          iid = issue_iid_from_testcase(testcase)
-
-          return unless iid
-
-          issues = search_issues(test: test, issue_type: 'issue', iid: iid)
-
-          warn(%(Issue iid "#{iid}" not valid)) if issues.empty?
-
-          issues.first
-        end
-
         def find_issue(test, issue_type)
-          issues = search_issues(test: test, issue_type: 'issue')
+          issues = gitlab.find_issues(options: { search: search_term(test) }) do |issue|
+            issue.state == 'opened' && issue.issue_type == issue_type && issue.title.strip == title_from_test(test)
+          end
 
-          warn(%(Too many issues found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
+          warn(%(Too many #{issue_type}s found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
 
           issues.first
         end
@@ -130,6 +150,8 @@ module Gitlab
           results_section = testcase.description.include?(RESULTS_SECTION_TEMPLATE) ? '' : RESULTS_SECTION_TEMPLATE
 
           gitlab.edit_issue(iid: testcase.iid, options: { description: (testcase.description + results_section + "\n\n#{issue.web_url}") })
+
+          puts "Added issue #{issue.web_url} to testcase #{testcase.web_url}"
         end
 
         def update_issue(issue, test)
@@ -157,12 +179,6 @@ module Gitlab
           labels << (test.failures.empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
         end
 
-        def search_issues(test:, issue_type:, iid: nil)
-          gitlab.find_issues(iid: iid, options: { search: search_term(test) }) do |issue|
-            issue.state == 'opened' && issue.issue_type == issue_type && issue.title.strip == title_from_test(test)
-          end
-        end
-
         def search_term(test)
           %("#{partial_file_path(test.file)}" "#{search_safe(test.name)}")
         end

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

@@ -16,6 +16,26 @@ module Gitlab
           'QA_REMOTE_GRID_ACCESS_KEY' => :remote_grid_access_key,
           'QA_REMOTE_GRID_PROTOCOL' => :remote_grid_protocol,
           'QA_BROWSER' => :browser,
+          '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_LOG_PATH' => :qa_log_path,
+          '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,
+          'QA_DISABLE_RSPEC_RETRY' => :qa_disable_rspec_retry,
+          'QA_SIMULATE_SLOW_CONNECTION' => :qa_simulate_slow_connection,
+          'QA_SLOW_CONNECTION_LATENCY_MS' => :qa_slow_connection_latency_ms,
+          'QA_SLOW_CONNECTION_THROUGHPUT_KBPS' => :qa_slow_connection_throughput_kbps,
+          'QA_GENERATE_ALLURE_REPORT' => :generate_allure_report,
+          'QA_EXPORT_TEST_METRICS' => :qa_export_test_metrics,
+          'QA_INFLUXDB_URL' => :qa_influxdb_url,
+          'QA_INFLUXDB_TOKEN' => :qa_influxdb_token,
+          'QA_RUN_TYPE' => :qa_run_type,
+          'QA_SKIP_PULL' => :qa_skip_pull,
           'GITLAB_API_BASE' => :api_base,
           'GITLAB_ADMIN_USERNAME' => :admin_username,
           'GITLAB_ADMIN_PASSWORD' => :admin_password,
@@ -40,21 +60,6 @@ module Gitlab
           'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
           'GCLOUD_REGION' => :gcloud_region,
           'SIGNUP_DISABLED' => :signup_disabled,
-          '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_LOG_PATH' => :qa_log_path,
-          '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,
-          'QA_DISABLE_RSPEC_RETRY' => :qa_disable_rspec_retry,
-          'QA_SIMULATE_SLOW_CONNECTION' => :qa_simulate_slow_connection,
-          'QA_SLOW_CONNECTION_LATENCY_MS' => :qa_slow_connection_latency_ms,
-          'QA_SLOW_CONNECTION_THROUGHPUT_KBPS' => :qa_slow_connection_throughput_kbps,
-          'QA_GENERATE_ALLURE_REPORT' => :generate_allure_report,
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
           'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
           'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
@@ -74,13 +79,14 @@ module Gitlab
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
           'CI_PROJECT_NAME' => :ci_project_name,
+          'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
+          'CI_PIPELINE_CREATED_AT' => :ci_pipeline_created_at,
+          'CI_MERGE_REQUEST_IID' => :ci_merge_request_iid,
           'GITLAB_CI' => :gitlab_ci,
-          'QA_SKIP_PULL' => :qa_skip_pull,
           'ELASTIC_URL' => :elastic_url,
           'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
           'MAILHOG_HOSTNAME' => :mailhog_hostname,
           'SLACK_QA_CHANNEL' => :slack_qa_channel,
-          'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
           '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,
@@ -97,7 +103,12 @@ module Gitlab
           'AWS_S3_REGION' => :aws_s3_region,
           'AWS_S3_KEY_ID' => :aws_s3_key_id,
           'AWS_S3_ACCESS_KEY' => :aws_s3_access_key,
-          'AWS_S3_BUCKET_NAME' => :aws_s3_bucket_name
+          'AWS_S3_BUCKET_NAME' => :aws_s3_bucket_name,
+          '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|
@@ -292,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.1'.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.1
+  version: 7.8.5
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-01 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