gitlab-qa 5.4.0 → 5.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6c05160ceef2a5c1f1cb655a1a0e00dafe3fc741c83cf3720cceaf5c052e99e6
4
- data.tar.gz: c734271a54bd03542af38490299bf88d9f9feb1038862852c4b3ae9fd2bb4955
3
+ metadata.gz: 79e9a356e7020a43aa03d5fd3a0dc75f4c90438c69cc2eaf9a8c2d0f8a034ffc
4
+ data.tar.gz: e1694bf700beabf8a30884b353eada1b16a3165af554db070c7dd3ea3df81210
5
5
  SHA512:
6
- metadata.gz: b71209010fc236f2907dc7cb03cccc3761ecc28b65ca698503f05f24503ac8963cb3018288c301f6e78dff1a11d41cc315600f84c6bbc74ed02ea67b13efec0f
7
- data.tar.gz: df6c7202be25a0dc0d6e0f8c0283313d4bd38f374ad62e0e66403be5be066471e779e45481d683c76b5267eaa4bbba330ff49f38898a38d5c89aee9b59ef9eed
6
+ metadata.gz: ae9b5c865beacbba24603a23166d9923afc94612c4177ee3cba34a5d5b0048adb8960c802d3f3e054eb10319295e2afc5fca098ad0d63654c58bf6cdffb8df65
7
+ data.tar.gz: d047164c69791b0a22e39860baaa69beee74535c64c34c95db672866e76d4616a085890c719a83213546fc12a6a0761732584e0175775a2f43ce1b44071e899d
@@ -1,18 +1,43 @@
1
+ stages:
2
+ - check
3
+ - release
4
+ - test
5
+ - notify
6
+
7
+ default:
8
+ image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.6
9
+ tags:
10
+ - gitlab-org
11
+ cache:
12
+ key:
13
+ files:
14
+ - Gemfile
15
+ - gitlab-qa.gemspec
16
+ paths:
17
+ - vendor/ruby
18
+ before_script:
19
+ - bundle version
20
+ - bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --quiet && bundle check
21
+ - if [ -n "$TRIGGERED_USER" ] && [ -n "$TRIGGER_SOURCE" ]; then
22
+ echo "Pipeline triggered by $TRIGGERED_USER at $TRIGGER_SOURCE";
23
+ fi
24
+ - export LANG=C.UTF-8
25
+
26
+ workflow:
27
+ rules:
28
+ # For merge requests, create a pipeline.
29
+ - if: '$CI_MERGE_REQUEST_IID'
30
+ # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
31
+ - if: '$CI_COMMIT_BRANCH == "master"'
32
+ # For tags, create a pipeline.
33
+ - if: '$CI_COMMIT_TAG'
34
+
1
35
  .default-rules:
2
36
  rules:
3
37
  - if: '$CI_COMMIT_TAG || $RELEASE'
4
38
  when: never
5
39
  - if: '$RELEASE == null && $CI_JOB_NAME =~ /staging/'
6
40
  when: manual
7
- - if: '$CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
8
-
9
- image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.6
10
-
11
- stages:
12
- - check
13
- - release
14
- - test
15
- - notify
16
41
 
17
42
  variables:
18
43
  DOCKER_DRIVER: overlay2
@@ -22,21 +47,7 @@ variables:
22
47
  QA_CAN_TEST_PRAEFECT: "false"
23
48
  QA_TESTCASES_REPORTING_PROJECT: "gitlab-org/quality/testcases"
24
49
 
25
- cache:
26
- key: "ruby:2.6"
27
- paths:
28
- - vendor/ruby
29
-
30
- before_script:
31
- - bundle version
32
- - bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --quiet && bundle check
33
- - if [ -n "$TRIGGERED_USER" ] && [ -n "$TRIGGER_SOURCE" ]; then
34
- echo "Pipeline triggered by $TRIGGERED_USER at $TRIGGER_SOURCE";
35
- fi
36
- - export LANG=C.UTF-8
37
-
38
50
  .check-base:
39
- extends: .default-rules
40
51
  stage: check
41
52
  script:
42
53
  - bundle exec $CI_JOB_NAME
@@ -67,6 +78,7 @@ release:
67
78
  services:
68
79
  - docker:19.03.0-dind
69
80
  tags:
81
+ - gitlab-org
70
82
  - docker
71
83
  artifacts:
72
84
  when: always
@@ -188,11 +188,20 @@ module Gitlab
188
188
  end
189
189
 
190
190
  def new_note_matches_discussion?(note, discussion)
191
- error_and_stack_trace(note) == error_and_stack_trace(discussion.notes.first['body'])
191
+ note_error = error_and_stack_trace(note)
192
+ discussion_error = error_and_stack_trace(discussion.notes.first['body'])
193
+
194
+ return false if note_error.empty? || discussion_error.empty?
195
+
196
+ note_error == discussion_error
192
197
  end
193
198
 
194
199
  def error_and_stack_trace(text)
195
- text.strip[/Error:(.*)/, 1]
200
+ result = text.strip[/Error:(.*)/m, 1].to_s
201
+
202
+ warn "Could not find `Error:` in text: #{text}" if result.empty?
203
+
204
+ result
196
205
  end
197
206
 
198
207
  def add_note_to_discussion(issue_iid, discussion_id)
@@ -1,5 +1,5 @@
1
1
  module Gitlab
2
2
  module QA
3
- VERSION = '5.4.0'.freeze
3
+ VERSION = '5.4.1'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlab-qa
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.4.0
4
+ version: 5.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Grzegorz Bizon
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-03-26 00:00:00.000000000 Z
11
+ date: 2020-04-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: climate_control