gitlab-qa 5.4.3 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b104344d3af630c69b69edb56915220bacf32e86a2b2d02159bef044112763d
-  data.tar.gz: b98743c7f6c138379c2350e29295c5c0e48b6156319651032c3877d3da0e70d7
+  metadata.gz: 77fe1e1cf434c67aaf9d068460b8269e31c988a8c77e93ff3427545370849d9b
+  data.tar.gz: bd9b0dc5b3a89075336da34ea0ebb6882228a06fcb7320003f906cdf5e17004b
 SHA512:
-  metadata.gz: 35ec93687d9dbbf06c8593b2de3080f2c75fe0f6110f2fa5c1c2b988c5b09efea5562073b38d455480f93172b574bc00fd2cc8a4971a74a76d719c9be43a5eb2
-  data.tar.gz: ad0ad93bbcf79ba906c80b46de51a790459a124460ddeff922bdca63f2aa44b42ca1366ddaab0d471197605519203cbfe177acf939ae8e86d59c9db6a90a21f9
+  metadata.gz: 10e68578bdbe034db633daf9fe238a9f200590ade25e4018b9889a9ab6bd3b71d72131c27044f7d9c740965febca1e64fa5f68bb231e377b278b01b71a713aa0
+  data.tar.gz: 02d8e5f9e03dc50caa19418c8d8f008909498b1fb963ed09867474df95fee3eade6e1b002b359354df4e3396e0bdb2ab1cdb39c6fb185ea87c05e9464dbbd2a7

data/.gitlab-ci.yml

@@ -90,6 +90,7 @@ release:
   script:
     - 'echo "Running: exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
     - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
+    - exe/gitlab-qa-report --update-screenshot-path "gitlab-qa-run-*/**/rspec-*.xml"
     - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
     - if [ "$TOP_UPSTREAM_SOURCE_REF" == "master" ]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.xml" --project "$QA_TESTCASES_REPORTING_PROJECT"; fi
     - exit $test_run_exit_code
@@ -226,6 +227,44 @@ ee:instance-quarantine:
   variables:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
+ce:docker:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag docker"
+
+ce:docker-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag docker --tag quarantine"
+
+ee:docker:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag docker"
+
+ee:docker-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag docker --tag quarantine"
+
 ce:relative_url:
   extends:
     - .test

data/lib/gitlab/qa.rb

@@ -90,6 +90,7 @@ module Gitlab
       autoload :PrepareStageReports, 'gitlab/qa/report/prepare_stage_reports'
       autoload :ResultsInIssues, 'gitlab/qa/report/results_in_issues'
       autoload :SummaryTable, 'gitlab/qa/report/summary_table'
+      autoload :UpdateScreenshotPath, 'gitlab/qa/report/update_screenshot_path'
     end
 
     module Slack

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

@@ -0,0 +1,39 @@
+require 'nokogiri'
+
+module Gitlab
+  module QA
+    module Report
+      class UpdateScreenshotPath
+        def initialize(files:)
+          @files = files
+        end
+
+        REGEX = %r{(?<gitlab_qa_run>gitlab-qa-run-.*?(?=\/))\/(?<gitlab_ce_ee_qa>gitlab-(ee|ce)-qa-.*?(?=\/))}
+
+        def invoke!
+          Dir.glob(@files).each do |rspec_report_file|
+            report = rewrite_each_screenshot_path(rspec_report_file)
+
+            File.write(rspec_report_file, report)
+
+            puts "Saved #{rspec_report_file}"
+          end
+        end
+
+        private
+
+        def rewrite_each_screenshot_path(rspec_report_file)
+          report = Nokogiri::XML(File.open(rspec_report_file))
+
+          match_data = rspec_report_file.match(REGEX)
+
+          report.xpath('//system-out').each do |system_out|
+            system_out.content = system_out.content.gsub(File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'tmp'), "#{match_data[:gitlab_qa_run]}/#{match_data[:gitlab_ce_ee_qa]}")
+          end
+
+          report.to_s
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/reporter.rb

@@ -40,6 +40,11 @@ module Gitlab
             slack_options[:message] = slack_options[:message] + "\n\n" + Gitlab::QA::Report::SummaryTable.create(input_files: files)
           end
 
+          opts.on('--update-screenshot-path FILES', "Update the path to screenshots to container's host") do |files|
+            report_options[:update_screenshot_path] = true
+            report_options[:files] = files
+          end
+
           opts.on_tail('-v', '--version', 'Show the version') do
             require 'gitlab/qa/version'
             puts "#{$PROGRAM_NAME} : #{VERSION}"
@@ -76,6 +81,14 @@ module Gitlab
 
             exit
           end
+
+          if report_options[:update_screenshot_path]
+            report_options.delete(:update_screenshot_path)
+
+            Gitlab::QA::Report::UpdateScreenshotPath.new(**report_options).invoke!
+
+            exit
+          end
         else
           puts options
           exit 1

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.4.3'.freeze
+    VERSION = '5.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 5.5.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -256,6 +256,7 @@ files:
 - lib/gitlab/qa/report/prepare_stage_reports.rb
 - lib/gitlab/qa/report/results_in_issues.rb
 - lib/gitlab/qa/report/summary_table.rb
+- lib/gitlab/qa/report/update_screenshot_path.rb
 - lib/gitlab/qa/reporter.rb
 - lib/gitlab/qa/runner.rb
 - lib/gitlab/qa/runtime/env.rb