gitlab-qa 4.1.0 → 4.2.0
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 +4 -4
- data/.gitlab-ci.yml +27 -0
- data/lib/gitlab/qa/component/elasticsearch.rb +2 -2
- data/lib/gitlab/qa/component/gitlab.rb +4 -0
- data/lib/gitlab/qa/runtime/env.rb +2 -1
- data/lib/gitlab/qa/scenario/test/integration/elasticsearch.rb +14 -3
- data/lib/gitlab/qa/version.rb +1 -1
- metadata +3 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e66787cfbd1b151a55db80cfda368315899534bdc89cf2a18ba45ebe0eb37c38
|
4
|
+
data.tar.gz: 998d63b9deca2e4cbff1bf312375fd01e3634f6b6efcef9ceaefed19f1995042
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 98d1bac9f731b3b250702f5b28abf7d0c0aa46bc9d3cc3155b02342fff5851150bbdd5d66f874ffb23b932de59646a575942a3a358b3c6a0b573efb1feabe2b4
|
7
|
+
data.tar.gz: 22ccf813d797cdd72277a55a58da1580fc9ba9e58860e6ef76328e68123118a03d5b26b83571a817def35f0f5ddd3f7e78a1d647d37579da0876bbc845c86e42
|
data/.gitlab-ci.yml
CHANGED
@@ -71,6 +71,20 @@ check:rspec:
|
|
71
71
|
- 7gb
|
72
72
|
- triggered-packages
|
73
73
|
|
74
|
+
.ee-parallel-knapsack: &ee-parallel-knapsack
|
75
|
+
parallel: 5
|
76
|
+
variables:
|
77
|
+
KNAPSACK_REPORT_PATH: "qa/ee/knapsack/nightly_master_report.json"
|
78
|
+
KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/*_spec.rb"
|
79
|
+
KNAPSACK_GENERATE_REPORT: "true"
|
80
|
+
|
81
|
+
.ce-parallel-knapsack: &ce-parallel-knapsack
|
82
|
+
parallel: 5
|
83
|
+
variables:
|
84
|
+
KNAPSACK_REPORT_PATH: "qa/ce/knapsack/nightly_master_report.json"
|
85
|
+
KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/*_spec.rb"
|
86
|
+
KNAPSACK_GENERATE_REPORT: "true"
|
87
|
+
|
74
88
|
.quarantine: &quarantine
|
75
89
|
allow_failure: true
|
76
90
|
|
@@ -94,6 +108,7 @@ ce:instance:
|
|
94
108
|
<<: *test
|
95
109
|
<<: *high-capacity
|
96
110
|
<<: *ce-qa
|
111
|
+
<<: *ce-parallel-knapsack
|
97
112
|
|
98
113
|
ce:instance-quarantine:
|
99
114
|
script:
|
@@ -109,6 +124,7 @@ ee:instance:
|
|
109
124
|
<<: *test
|
110
125
|
<<: *high-capacity
|
111
126
|
<<: *ee-qa
|
127
|
+
<<: *ee-parallel-knapsack
|
112
128
|
|
113
129
|
ee:instance-quarantine:
|
114
130
|
script:
|
@@ -138,6 +154,7 @@ ce:relative_url:
|
|
138
154
|
<<: *test
|
139
155
|
<<: *high-capacity
|
140
156
|
<<: *ce-qa
|
157
|
+
<<: *ce-parallel-knapsack
|
141
158
|
|
142
159
|
ce:relative_url-quarantine:
|
143
160
|
script:
|
@@ -153,6 +170,7 @@ ee:relative_url:
|
|
153
170
|
<<: *test
|
154
171
|
<<: *high-capacity
|
155
172
|
<<: *ee-qa
|
173
|
+
<<: *ee-parallel-knapsack
|
156
174
|
|
157
175
|
ee:relative_url-quarantine:
|
158
176
|
script:
|
@@ -180,6 +198,7 @@ ce:update:
|
|
180
198
|
<<: *test
|
181
199
|
<<: *high-capacity
|
182
200
|
<<: *ce-qa
|
201
|
+
<<: *ce-parallel-knapsack
|
183
202
|
|
184
203
|
ce:update-quarantine:
|
185
204
|
script:
|
@@ -195,6 +214,7 @@ ee:update:
|
|
195
214
|
<<: *test
|
196
215
|
<<: *high-capacity
|
197
216
|
<<: *ee-qa
|
217
|
+
<<: *ee-parallel-knapsack
|
198
218
|
|
199
219
|
ee:update-quarantine:
|
200
220
|
script:
|
@@ -474,6 +494,13 @@ ee:oauth-quarantine:
|
|
474
494
|
<<: *ee-qa
|
475
495
|
<<: *quarantine
|
476
496
|
|
497
|
+
ee:elasticsearch:
|
498
|
+
script:
|
499
|
+
- exe/gitlab-qa Test::Integration::Elasticsearch ${RELEASE:=EE}
|
500
|
+
<<: *test
|
501
|
+
<<: *high-capacity
|
502
|
+
<<: *ee-qa
|
503
|
+
|
477
504
|
.notify_upstream_commit: ¬ify_upstream_commit
|
478
505
|
stage: notify
|
479
506
|
image: $TEST_IMAGE
|
@@ -5,7 +5,7 @@ module Gitlab
|
|
5
5
|
include Scenario::Actable
|
6
6
|
|
7
7
|
ELASTIC_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch'.freeze
|
8
|
-
ELASTIC_IMAGE_TAG = '
|
8
|
+
ELASTIC_IMAGE_TAG = '6.8.1'.freeze
|
9
9
|
|
10
10
|
attr_reader :docker
|
11
11
|
attr_accessor :environment, :network
|
@@ -17,7 +17,7 @@ module Gitlab
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def name
|
20
|
-
@name ||= "
|
20
|
+
@name ||= "elastic68"
|
21
21
|
end
|
22
22
|
|
23
23
|
def instance
|
@@ -54,7 +54,8 @@ module Gitlab
|
|
54
54
|
'CI_NODE_INDEX' => :ci_node_index,
|
55
55
|
'CI_NODE_TOTAL' => :ci_node_total,
|
56
56
|
'GITLAB_CI' => :gitlab_ci,
|
57
|
-
'QA_SKIP_PULL' => :qa_skip_pull
|
57
|
+
'QA_SKIP_PULL' => :qa_skip_pull,
|
58
|
+
'ELASTIC_URL' => :elastic_url
|
58
59
|
}.freeze
|
59
60
|
|
60
61
|
ENV_VARIABLES.each_value do |accessor|
|
@@ -8,7 +8,7 @@ module Gitlab
|
|
8
8
|
|
9
9
|
def initialize
|
10
10
|
@gitlab_name = 'gitlab-elastic'
|
11
|
-
@spec_suite = 'Test::Integration::Elasticsearch'
|
11
|
+
@spec_suite = 'QA::EE::Scenario::Test::Integration::Elasticsearch'
|
12
12
|
end
|
13
13
|
|
14
14
|
def before_perform(release)
|
@@ -21,10 +21,10 @@ module Gitlab
|
|
21
21
|
|
22
22
|
Component::Gitlab.perform do |gitlab|
|
23
23
|
gitlab.release = release
|
24
|
-
gitlab
|
25
|
-
gitlab.network = 'test'
|
24
|
+
setup_elasticsearch_on gitlab
|
26
25
|
|
27
26
|
Component::Elasticsearch.perform do |elastic|
|
27
|
+
elastic.network = 'test'
|
28
28
|
elastic.instance do
|
29
29
|
gitlab.instance do
|
30
30
|
puts "Running #{spec_suite} specs!"
|
@@ -40,6 +40,17 @@ module Gitlab
|
|
40
40
|
end
|
41
41
|
end
|
42
42
|
end
|
43
|
+
|
44
|
+
def empty_index
|
45
|
+
@empty_index ||= ["gitlab-rake gitlab:elastic:create_empty_index"]
|
46
|
+
end
|
47
|
+
|
48
|
+
def setup_elasticsearch_on(instance)
|
49
|
+
instance.name = gitlab_name
|
50
|
+
instance.network = 'test'
|
51
|
+
instance.elastic_url = 'http://elastic68:9200'
|
52
|
+
instance.exec_commands = empty_index
|
53
|
+
end
|
43
54
|
end
|
44
55
|
end
|
45
56
|
end
|
data/lib/gitlab/qa/version.rb
CHANGED
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: 4.
|
4
|
+
version: 4.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Grzegorz Bizon
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-07-
|
11
|
+
date: 2019-07-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: climate_control
|
@@ -213,8 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
213
213
|
- !ruby/object:Gem::Version
|
214
214
|
version: '0'
|
215
215
|
requirements: []
|
216
|
-
|
217
|
-
rubygems_version: 2.7.6
|
216
|
+
rubygems_version: 3.0.3
|
218
217
|
signing_key:
|
219
218
|
specification_version: 4
|
220
219
|
summary: Integration tests for GitLab
|