gitlab-qa 7.21.0 → 7.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df136e02dc7640dd456d9e6f0f089cfdf105c7e8d4983ee41e487081eadb3eb
-  data.tar.gz: 9ab31d33024c1a2e6826213028e4a1f1c3ab69c8ece4d230be79a4f3b1f15108
+  metadata.gz: 9d0474bbb165c8eb249d43ecaf01951a84cb6afe3e2acaae1277f8a5ef69cec1
+  data.tar.gz: 5fc154945416823b3ae095c88f41166eddf41896ec2c4be7d7a1c734d179b1a8
 SHA512:
-  metadata.gz: 5420d4ffea08d120903f51fa9d590b20cfee1686ecdff384ac2ff931ba1ead170409a412e3c45cb96f6310359540d245624bf05fce654f106030550d68ff8928
-  data.tar.gz: 459ce3e23b1113bcb52b2413d6cae58dc9946976e7615833fd5fbe9d0b979d0894c964fc6565cb2a0e13e9953369c4073b6a5ec00510b24edec3cd4b2ad00a61
+  metadata.gz: 86d3bd714931d4868e053629ba7fe65307e77e5199356fe3e85d23647023eccbcf76be49398c2f0a74c47348b6f3e7df57c10b12f3636c6587fd7f2175c203a0
+  data.tar.gz: d62d1eec5495a1fa420bdcdf0c95ba3222800519962871669ff2b4dad1f6046fe9d91f7413a397a75c66e405b7c10b19c200f378448b3ab37d5aee7c0c3110fb

data/.gitlab-ci.yml

@@ -95,7 +95,11 @@ rspec:
 .combined-gitlab-qa-options-script:
   script:
     - 'echo "Running: bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS_COMBINED -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
-    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS_COMBINED -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS
+    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS_COMBINED -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
+    - bundle exec 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" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-results "gitlab-qa-run-*/**/rspec-*.json" --test-case-project "$QA_TESTCASES_REPORTING_PROJECT" --results-issue-project "$QA_TEST_RESULTS_ISSUES_PROJECT" || true; fi
+    - exit $test_run_exit_code
 
 # The Test::Omnibus::Update scenarios require the release to be specified twice, which can't be done dynamically using the `variables` parameter
 # So instead we can use this script with two release variables

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

@@ -157,8 +157,8 @@ module Gitlab
               gather_services = false
               container_names = []
               source_tag = false
-              container_name_include = ["gitlab-{ce,ee}-*", "gitlab-{ce,ee}-qa-*"]
-              container_name_exclude = []
+              container_name_include = []
+              container_name_exclude = ["#{name}"]
               timeout = "5s"
               perdevice = false
               perdevice_include = []

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.21.0'
+    VERSION = '7.21.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.21.0
+  version: 7.21.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control