gitlab-qa 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c05160ceef2a5c1f1cb655a1a0e00dafe3fc741c83cf3720cceaf5c052e99e6
-  data.tar.gz: c734271a54bd03542af38490299bf88d9f9feb1038862852c4b3ae9fd2bb4955
+  metadata.gz: 79e9a356e7020a43aa03d5fd3a0dc75f4c90438c69cc2eaf9a8c2d0f8a034ffc
+  data.tar.gz: e1694bf700beabf8a30884b353eada1b16a3165af554db070c7dd3ea3df81210
 SHA512:
-  metadata.gz: b71209010fc236f2907dc7cb03cccc3761ecc28b65ca698503f05f24503ac8963cb3018288c301f6e78dff1a11d41cc315600f84c6bbc74ed02ea67b13efec0f
-  data.tar.gz: df6c7202be25a0dc0d6e0f8c0283313d4bd38f374ad62e0e66403be5be066471e779e45481d683c76b5267eaa4bbba330ff49f38898a38d5c89aee9b59ef9eed
+  metadata.gz: ae9b5c865beacbba24603a23166d9923afc94612c4177ee3cba34a5d5b0048adb8960c802d3f3e054eb10319295e2afc5fca098ad0d63654c58bf6cdffb8df65
+  data.tar.gz: d047164c69791b0a22e39860baaa69beee74535c64c34c95db672866e76d4616a085890c719a83213546fc12a6a0761732584e0175775a2f43ce1b44071e899d

data/.gitlab-ci.yml

@@ -1,18 +1,43 @@
+stages:
+  - check
+  - release
+  - test
+  - notify
+
+default:
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.6
+  tags:
+    - gitlab-org
+  cache:
+    key:
+      files:
+        - Gemfile
+        - gitlab-qa.gemspec
+    paths:
+      - vendor/ruby
+  before_script:
+    - bundle version
+    - bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --quiet && bundle check
+    - if [ -n "$TRIGGERED_USER" ] && [ -n "$TRIGGER_SOURCE" ]; then
+        echo "Pipeline triggered by $TRIGGERED_USER at $TRIGGER_SOURCE";
+      fi
+    - export LANG=C.UTF-8
+
+workflow:
+  rules:
+    # For merge requests, create a pipeline.
+    - if: '$CI_MERGE_REQUEST_IID'
+    # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
+    - if: '$CI_COMMIT_BRANCH == "master"'
+    # For tags, create a pipeline.
+    - if: '$CI_COMMIT_TAG'
+
 .default-rules:
   rules:
     - if: '$CI_COMMIT_TAG || $RELEASE'
       when: never
     - if: '$RELEASE == null && $CI_JOB_NAME =~ /staging/'
       when: manual
-    - if: '$CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
-
-image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.6
-
-stages:
-  - check
-  - release
-  - test
-  - notify
 
 variables:
   DOCKER_DRIVER: overlay2
@@ -22,21 +47,7 @@ variables:
   QA_CAN_TEST_PRAEFECT: "false"
   QA_TESTCASES_REPORTING_PROJECT: "gitlab-org/quality/testcases"
 
-cache:
-  key: "ruby:2.6"
-  paths:
-    - vendor/ruby
-
-before_script:
-  - bundle version
-  - bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --quiet && bundle check
-  - if [ -n "$TRIGGERED_USER" ] && [ -n "$TRIGGER_SOURCE" ]; then
-      echo "Pipeline triggered by $TRIGGERED_USER at $TRIGGER_SOURCE";
-    fi
-  - export LANG=C.UTF-8
-
 .check-base:
-  extends: .default-rules
   stage: check
   script:
     - bundle exec $CI_JOB_NAME
@@ -67,6 +78,7 @@ release:
   services:
     - docker:19.03.0-dind
   tags:
+    - gitlab-org
     - docker
   artifacts:
     when: always

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

@@ -188,11 +188,20 @@ module Gitlab
         end
 
         def new_note_matches_discussion?(note, discussion)
-          error_and_stack_trace(note) == error_and_stack_trace(discussion.notes.first['body'])
+          note_error = error_and_stack_trace(note)
+          discussion_error = error_and_stack_trace(discussion.notes.first['body'])
+
+          return false if note_error.empty? || discussion_error.empty?
+
+          note_error == discussion_error
         end
 
         def error_and_stack_trace(text)
-          text.strip[/Error:(.*)/, 1]
+          result = text.strip[/Error:(.*)/m, 1].to_s
+
+          warn "Could not find `Error:` in text: #{text}" if result.empty?
+
+          result
         end
 
         def add_note_to_discussion(issue_iid, discussion_id)

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.4.0'.freeze
+    VERSION = '5.4.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control