gitlab-qa 2.12.0 → 2.13.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitlab-ci.yml +153 -8
- data/docs/run_qa_against_gdk.md +2 -0
- data/lib/gitlab/qa/scenario/test/instance/relative_url.rb +2 -2
- data/lib/gitlab/qa/scenario/test/integration/geo.rb +3 -2
- data/lib/gitlab/qa/scenario/test/integration/mattermost.rb +2 -2
- data/lib/gitlab/qa/scenario/test/integration/object_storage.rb +2 -2
- data/lib/gitlab/qa/scenario/test/integration/saml.rb +2 -2
- data/lib/gitlab/qa/scenario/test/omnibus/update.rb +2 -2
- data/lib/gitlab/qa/scenario/test/omnibus/upgrade.rb +3 -3
- data/lib/gitlab/qa/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 895715c8f6cd7bc3343e8a48a3d61e14d5442ddfa88518fd28910a9fce76d046
|
4
|
+
data.tar.gz: 1d40c6c72c48949fbe5e788e4b37c39e9fc13bb02decd6258d1dfd7d1dbab914
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 82b5831b1ddd007d3a441b152f6cb58e68e2c348c53131954995ca4902d0c40df01017eb995b8c8ce35fdcf4a0f6823882f360aa98e9b0a86f2f2dd0ec91756f
|
7
|
+
data.tar.gz: 516ef5cb80c4a150409bcf91c41cf013d7ee30220b2b4857c41098c7a8f2b263472063de4be4ae0146817420235e9d590bca0ed9d2ffa2fac21cb74dec1c0945
|
data/.gitlab-ci.yml
CHANGED
@@ -71,6 +71,9 @@ check:rspec:
|
|
71
71
|
- 7gb
|
72
72
|
- triggered-packages
|
73
73
|
|
74
|
+
.quarantine: &quarantine
|
75
|
+
allow_failure: true
|
76
|
+
|
74
77
|
ce:sanity-framework:
|
75
78
|
script:
|
76
79
|
- ./bin/expect_exit_code_and_text "bin/qa Test::Instance::Image ${RELEASE:=CE} --tag framework" 1 "2 examples, 1 failure"
|
@@ -93,12 +96,12 @@ ce:instance:
|
|
93
96
|
<<: *ce-qa
|
94
97
|
|
95
98
|
ce:instance-quarantine:
|
96
|
-
allow_failure: true
|
97
99
|
script:
|
98
100
|
- bin/qa Test::Instance::Image ${RELEASE:=CE} --tag quarantine --tag ~orchestrated
|
99
101
|
<<: *test
|
100
102
|
<<: *high-capacity
|
101
103
|
<<: *ce-qa
|
104
|
+
<<: *quarantine
|
102
105
|
|
103
106
|
ee:instance:
|
104
107
|
script:
|
@@ -108,12 +111,26 @@ ee:instance:
|
|
108
111
|
<<: *ee-qa
|
109
112
|
|
110
113
|
ee:instance-quarantine:
|
111
|
-
allow_failure: true
|
112
114
|
script:
|
113
115
|
- bin/qa Test::Instance::Image ${RELEASE:=EE} --tag quarantine --tag ~orchestrated
|
114
116
|
<<: *test
|
115
117
|
<<: *high-capacity
|
116
118
|
<<: *ee-qa
|
119
|
+
<<: *quarantine
|
120
|
+
|
121
|
+
ce:docker:
|
122
|
+
script:
|
123
|
+
- bin/qa Test::Instance::Image ${RELEASE:=CE} --tag docker
|
124
|
+
<<: *test
|
125
|
+
<<: *high-capacity
|
126
|
+
<<: *ce-qa
|
127
|
+
|
128
|
+
ee:docker:
|
129
|
+
script:
|
130
|
+
- bin/qa Test::Instance::Image ${RELEASE:=EE} --tag docker
|
131
|
+
<<: *test
|
132
|
+
<<: *high-capacity
|
133
|
+
<<: *ee-qa
|
117
134
|
|
118
135
|
ce:relative_url:
|
119
136
|
script:
|
@@ -122,6 +139,14 @@ ce:relative_url:
|
|
122
139
|
<<: *high-capacity
|
123
140
|
<<: *ce-qa
|
124
141
|
|
142
|
+
ce:relative_url-quarantine:
|
143
|
+
script:
|
144
|
+
- bin/qa Test::Instance::RelativeUrl ${RELEASE:=CE} --tag quarantine --tag ~orchestrated
|
145
|
+
<<: *test
|
146
|
+
<<: *high-capacity
|
147
|
+
<<: *ce-qa
|
148
|
+
<<: *quarantine
|
149
|
+
|
125
150
|
ee:relative_url:
|
126
151
|
script:
|
127
152
|
- bin/qa Test::Instance::RelativeUrl ${RELEASE:=EE}
|
@@ -129,6 +154,14 @@ ee:relative_url:
|
|
129
154
|
<<: *high-capacity
|
130
155
|
<<: *ee-qa
|
131
156
|
|
157
|
+
ee:relative_url-quarantine:
|
158
|
+
script:
|
159
|
+
- bin/qa Test::Instance::RelativeUrl ${RELEASE:=EE} --tag quarantine --tag ~orchestrated
|
160
|
+
<<: *test
|
161
|
+
<<: *high-capacity
|
162
|
+
<<: *ee-qa
|
163
|
+
<<: *quarantine
|
164
|
+
|
132
165
|
ce:image:
|
133
166
|
script:
|
134
167
|
- bin/qa Test::Omnibus::Image ${RELEASE:=CE}
|
@@ -148,6 +181,14 @@ ce:update:
|
|
148
181
|
<<: *high-capacity
|
149
182
|
<<: *ce-qa
|
150
183
|
|
184
|
+
ce:update-quarantine:
|
185
|
+
script:
|
186
|
+
- bin/qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} --tag quarantine --tag ~orchestrated
|
187
|
+
<<: *test
|
188
|
+
<<: *high-capacity
|
189
|
+
<<: *ce-qa
|
190
|
+
<<: *quarantine
|
191
|
+
|
151
192
|
ee:update:
|
152
193
|
script:
|
153
194
|
- bin/qa Test::Omnibus::Update ${RELEASE:=EE}
|
@@ -155,6 +196,14 @@ ee:update:
|
|
155
196
|
<<: *high-capacity
|
156
197
|
<<: *ee-qa
|
157
198
|
|
199
|
+
ee:update-quarantine:
|
200
|
+
script:
|
201
|
+
- bin/qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} --tag quarantine --tag ~orchestrated
|
202
|
+
<<: *test
|
203
|
+
<<: *high-capacity
|
204
|
+
<<: *ee-qa
|
205
|
+
<<: *quarantine
|
206
|
+
|
158
207
|
ce:upgrade:
|
159
208
|
script:
|
160
209
|
- bin/qa Test::Omnibus::Upgrade
|
@@ -162,6 +211,14 @@ ce:upgrade:
|
|
162
211
|
<<: *high-capacity
|
163
212
|
<<: *only-qa
|
164
213
|
|
214
|
+
ce:upgrade-quarantine:
|
215
|
+
script:
|
216
|
+
- bin/qa Test::Omnibus::Upgrade CE --tag quarantine --tag ~orchestrated
|
217
|
+
<<: *test
|
218
|
+
<<: *high-capacity
|
219
|
+
<<: *only-qa
|
220
|
+
<<: *quarantine
|
221
|
+
|
165
222
|
ee-previous-to-ce:update:
|
166
223
|
script:
|
167
224
|
- bin/qa Test::Omnibus::Update EE CE
|
@@ -169,6 +226,14 @@ ee-previous-to-ce:update:
|
|
169
226
|
<<: *high-capacity
|
170
227
|
<<: *only-qa
|
171
228
|
|
229
|
+
ee-previous-to-ce:update-quarantine:
|
230
|
+
script:
|
231
|
+
- bin/qa Test::Omnibus::Update EE CE --tag quarantine --tag ~orchestrated
|
232
|
+
<<: *test
|
233
|
+
<<: *high-capacity
|
234
|
+
<<: *only-qa
|
235
|
+
<<: *quarantine
|
236
|
+
|
172
237
|
ce:mattermost:
|
173
238
|
script:
|
174
239
|
- bin/qa Test::Integration::Mattermost ${RELEASE:=CE}
|
@@ -176,6 +241,14 @@ ce:mattermost:
|
|
176
241
|
<<: *high-capacity
|
177
242
|
<<: *ce-qa
|
178
243
|
|
244
|
+
ce:mattermost-quarantine:
|
245
|
+
script:
|
246
|
+
- bin/qa Test::Integration::Mattermost ${RELEASE:=CE} --tag quarantine
|
247
|
+
<<: *test
|
248
|
+
<<: *high-capacity
|
249
|
+
<<: *ce-qa
|
250
|
+
<<: *quarantine
|
251
|
+
|
179
252
|
ee:mattermost:
|
180
253
|
script:
|
181
254
|
- bin/qa Test::Integration::Mattermost ${RELEASE:=EE}
|
@@ -183,6 +256,14 @@ ee:mattermost:
|
|
183
256
|
<<: *high-capacity
|
184
257
|
<<: *ee-qa
|
185
258
|
|
259
|
+
ee:mattermost-quarantine:
|
260
|
+
script:
|
261
|
+
- bin/qa Test::Integration::Mattermost ${RELEASE:=EE} --tag quarantine
|
262
|
+
<<: *test
|
263
|
+
<<: *high-capacity
|
264
|
+
<<: *ee-qa
|
265
|
+
<<: *quarantine
|
266
|
+
|
186
267
|
ee:geo:
|
187
268
|
script:
|
188
269
|
- bin/qa Test::Integration::Geo ${RELEASE:=EE}
|
@@ -190,6 +271,14 @@ ee:geo:
|
|
190
271
|
<<: *high-capacity
|
191
272
|
<<: *ee-qa
|
192
273
|
|
274
|
+
ee:geo-quarantine:
|
275
|
+
script:
|
276
|
+
- bin/qa Test::Integration::Geo ${RELEASE:=EE} -- --tag quarantine
|
277
|
+
<<: *test
|
278
|
+
<<: *high-capacity
|
279
|
+
<<: *ee-qa
|
280
|
+
<<: *quarantine
|
281
|
+
|
193
282
|
ce:ldap_no_tls:
|
194
283
|
script:
|
195
284
|
- bin/qa Test::Integration::LDAPNoTLS ${RELEASE:=CE}
|
@@ -198,12 +287,12 @@ ce:ldap_no_tls:
|
|
198
287
|
<<: *ce-qa
|
199
288
|
|
200
289
|
ce:ldap_no_tls-quarantine:
|
201
|
-
allow_failure: true
|
202
290
|
script:
|
203
291
|
- bin/qa Test::Integration::LDAPNoTLS ${RELEASE:=CE} --tag quarantine
|
204
292
|
<<: *test
|
205
293
|
<<: *high-capacity
|
206
294
|
<<: *ce-qa
|
295
|
+
<<: *quarantine
|
207
296
|
|
208
297
|
ee:ldap_no_tls:
|
209
298
|
script:
|
@@ -213,12 +302,12 @@ ee:ldap_no_tls:
|
|
213
302
|
<<: *ee-qa
|
214
303
|
|
215
304
|
ee:ldap_no_tls-quarantine:
|
216
|
-
allow_failure: true
|
217
305
|
script:
|
218
306
|
- bin/qa Test::Integration::LDAPNoTLS ${RELEASE:=EE} --tag quarantine
|
219
307
|
<<: *test
|
220
308
|
<<: *high-capacity
|
221
309
|
<<: *ee-qa
|
310
|
+
<<: *quarantine
|
222
311
|
|
223
312
|
ce:ldap_tls:
|
224
313
|
script:
|
@@ -228,12 +317,12 @@ ce:ldap_tls:
|
|
228
317
|
<<: *ce-qa
|
229
318
|
|
230
319
|
ce:ldap_tls-quarantine:
|
231
|
-
allow_failure: true
|
232
320
|
script:
|
233
321
|
- bin/qa Test::Integration::LDAPTLS ${RELEASE:=CE} --tag quarantine
|
234
322
|
<<: *test
|
235
323
|
<<: *high-capacity
|
236
324
|
<<: *ce-qa
|
325
|
+
<<: *quarantine
|
237
326
|
|
238
327
|
ee:ldap_tls:
|
239
328
|
script:
|
@@ -243,12 +332,12 @@ ee:ldap_tls:
|
|
243
332
|
<<: *ee-qa
|
244
333
|
|
245
334
|
ee:ldap_tls-quarantine:
|
246
|
-
allow_failure: true
|
247
335
|
script:
|
248
336
|
- bin/qa Test::Integration::LDAPTLS ${RELEASE:=EE} --tag quarantine
|
249
337
|
<<: *test
|
250
338
|
<<: *high-capacity
|
251
339
|
<<: *ee-qa
|
340
|
+
<<: *quarantine
|
252
341
|
|
253
342
|
ce:instance_saml:
|
254
343
|
script:
|
@@ -257,6 +346,14 @@ ce:instance_saml:
|
|
257
346
|
<<: *high-capacity
|
258
347
|
<<: *ce-qa
|
259
348
|
|
349
|
+
ce:instance_saml-quarantine:
|
350
|
+
script:
|
351
|
+
- bin/qa Test::Integration::InstanceSAML ${RELEASE:=CE} --tag quarantine
|
352
|
+
<<: *test
|
353
|
+
<<: *high-capacity
|
354
|
+
<<: *ce-qa
|
355
|
+
<<: *quarantine
|
356
|
+
|
260
357
|
ee:instance_saml:
|
261
358
|
script:
|
262
359
|
- bin/qa Test::Integration::InstanceSAML ${RELEASE:=EE}
|
@@ -264,6 +361,14 @@ ee:instance_saml:
|
|
264
361
|
<<: *high-capacity
|
265
362
|
<<: *ee-qa
|
266
363
|
|
364
|
+
ee:instance_saml-quarantine:
|
365
|
+
script:
|
366
|
+
- bin/qa Test::Integration::InstanceSAML ${RELEASE:=EE} --tag quarantine
|
367
|
+
<<: *test
|
368
|
+
<<: *high-capacity
|
369
|
+
<<: *ee-qa
|
370
|
+
<<: *quarantine
|
371
|
+
|
267
372
|
ee:group_saml:
|
268
373
|
script:
|
269
374
|
- bin/qa Test::Integration::GroupSAML ${RELEASE:=EE}
|
@@ -271,6 +376,14 @@ ee:group_saml:
|
|
271
376
|
<<: *high-capacity
|
272
377
|
<<: *ee-qa
|
273
378
|
|
379
|
+
ee:group_saml-quarantine:
|
380
|
+
script:
|
381
|
+
- bin/qa Test::Integration::GroupSAML ${RELEASE:=EE} --tag quarantine
|
382
|
+
<<: *test
|
383
|
+
<<: *high-capacity
|
384
|
+
<<: *ee-qa
|
385
|
+
<<: *quarantine
|
386
|
+
|
274
387
|
ce:kubernetes:
|
275
388
|
script:
|
276
389
|
- bin/qa Test::Integration::Kubernetes ${RELEASE:=CE}
|
@@ -279,12 +392,12 @@ ce:kubernetes:
|
|
279
392
|
<<: *ce-qa
|
280
393
|
|
281
394
|
ce:kubernetes-quarantine:
|
282
|
-
allow_failure: true
|
283
395
|
script:
|
284
396
|
- bin/qa Test::Integration::Kubernetes ${RELEASE:=CE} --tag quarantine
|
285
397
|
<<: *test
|
286
398
|
<<: *high-capacity
|
287
399
|
<<: *ce-qa
|
400
|
+
<<: *quarantine
|
288
401
|
|
289
402
|
ee:kubernetes:
|
290
403
|
script:
|
@@ -294,12 +407,12 @@ ee:kubernetes:
|
|
294
407
|
<<: *ee-qa
|
295
408
|
|
296
409
|
ee:kubernetes-quarantine:
|
297
|
-
allow_failure: true
|
298
410
|
script:
|
299
411
|
- bin/qa Test::Integration::Kubernetes ${RELEASE:=EE} --tag quarantine
|
300
412
|
<<: *test
|
301
413
|
<<: *high-capacity
|
302
414
|
<<: *ee-qa
|
415
|
+
<<: *quarantine
|
303
416
|
|
304
417
|
ce:object_storage:
|
305
418
|
script:
|
@@ -308,6 +421,14 @@ ce:object_storage:
|
|
308
421
|
<<: *high-capacity
|
309
422
|
<<: *ce-qa
|
310
423
|
|
424
|
+
ce:object_storage-quarantine:
|
425
|
+
script:
|
426
|
+
- bin/qa Test::Integration::ObjectStorage ${RELEASE:=CE} --tag quarantine
|
427
|
+
<<: *test
|
428
|
+
<<: *high-capacity
|
429
|
+
<<: *ce-qa
|
430
|
+
<<: *quarantine
|
431
|
+
|
311
432
|
ee:object_storage:
|
312
433
|
script:
|
313
434
|
- bin/qa Test::Integration::ObjectStorage ${RELEASE:=EE}
|
@@ -315,6 +436,14 @@ ee:object_storage:
|
|
315
436
|
<<: *high-capacity
|
316
437
|
<<: *ee-qa
|
317
438
|
|
439
|
+
ee:object_storage-quarantine:
|
440
|
+
script:
|
441
|
+
- bin/qa Test::Integration::ObjectStorage ${RELEASE:=EE} --tag quarantine
|
442
|
+
<<: *test
|
443
|
+
<<: *high-capacity
|
444
|
+
<<: *ee-qa
|
445
|
+
<<: *quarantine
|
446
|
+
|
318
447
|
ce:oauth:
|
319
448
|
script:
|
320
449
|
- bin/qa Test::Integration::OAuth ${RELEASE:=CE}
|
@@ -322,6 +451,14 @@ ce:oauth:
|
|
322
451
|
<<: *high-capacity
|
323
452
|
<<: *ce-qa
|
324
453
|
|
454
|
+
ce:oauth-quarantine:
|
455
|
+
script:
|
456
|
+
- bin/qa Test::Integration::OAuth ${RELEASE:=CE} --tag quarantine
|
457
|
+
<<: *test
|
458
|
+
<<: *high-capacity
|
459
|
+
<<: *ce-qa
|
460
|
+
<<: *quarantine
|
461
|
+
|
325
462
|
ee:oauth:
|
326
463
|
script:
|
327
464
|
- bin/qa Test::Integration::OAuth ${RELEASE:=EE}
|
@@ -329,6 +466,14 @@ ee:oauth:
|
|
329
466
|
<<: *high-capacity
|
330
467
|
<<: *ee-qa
|
331
468
|
|
469
|
+
ee:oauth-quarantine:
|
470
|
+
script:
|
471
|
+
- bin/qa Test::Integration::OAuth ${RELEASE:=EE} --tag quarantine
|
472
|
+
<<: *test
|
473
|
+
<<: *high-capacity
|
474
|
+
<<: *ee-qa
|
475
|
+
<<: *quarantine
|
476
|
+
|
332
477
|
.notify_upstream_commit: ¬ify_upstream_commit
|
333
478
|
stage: notify
|
334
479
|
image: $TEST_IMAGE
|
data/docs/run_qa_against_gdk.md
CHANGED
@@ -4,6 +4,8 @@ To run the `Test::Instance::Any` scenario against your local GDK, you'll need to
|
|
4
4
|
make a few changes to your `gdk/gitlab/config/gitlab.yml` file.
|
5
5
|
|
6
6
|
1. Retrieve your current local IP with `ifconfig`, e.g. `192.168.0.12`.
|
7
|
+
1. Create a file named `host` in your GDK directory containing your IP. E.g.:
|
8
|
+
`echo 192.168.0.12 > host`
|
7
9
|
1. Edit `gdk/gitlab/config/gitlab.yml` and replace `host: localhost` with
|
8
10
|
`host: 192.168.0.12`.
|
9
11
|
1. Also replace `ssh_host: localhost` (found under `gitlab_shell`) with
|
@@ -4,7 +4,7 @@ module Gitlab
|
|
4
4
|
module Test
|
5
5
|
module Instance
|
6
6
|
class RelativeUrl < Image
|
7
|
-
def perform(release)
|
7
|
+
def perform(release, *rspec_args)
|
8
8
|
Component::Gitlab.perform do |gitlab|
|
9
9
|
gitlab.release = release
|
10
10
|
gitlab.network = 'test'
|
@@ -19,7 +19,7 @@ module Gitlab
|
|
19
19
|
specs.suite = 'Test::Instance'
|
20
20
|
specs.release = gitlab.release
|
21
21
|
specs.network = gitlab.network
|
22
|
-
specs.args = [gitlab.address]
|
22
|
+
specs.args = [gitlab.address, *rspec_args]
|
23
23
|
end
|
24
24
|
end
|
25
25
|
end
|
@@ -11,7 +11,7 @@ module Gitlab
|
|
11
11
|
# rubocop:disable Metrics/MethodLength
|
12
12
|
# rubocop:disable Metrics/AbcSize
|
13
13
|
#
|
14
|
-
def perform(release)
|
14
|
+
def perform(release, *rspec_args)
|
15
15
|
release = Release.new(release)
|
16
16
|
|
17
17
|
raise ArgumentError, 'Geo is EE only!' unless release.ee?
|
@@ -67,7 +67,8 @@ module Gitlab
|
|
67
67
|
'--primary-address', primary.address,
|
68
68
|
'--primary-name', primary.name,
|
69
69
|
'--secondary-address', secondary.address,
|
70
|
-
'--secondary-name', secondary.name
|
70
|
+
'--secondary-name', secondary.name,
|
71
|
+
*rspec_args
|
71
72
|
]
|
72
73
|
end
|
73
74
|
|
@@ -4,7 +4,7 @@ module Gitlab
|
|
4
4
|
module Test
|
5
5
|
module Integration
|
6
6
|
class Mattermost < Scenario::Template
|
7
|
-
def perform(release)
|
7
|
+
def perform(release, *rspec_args)
|
8
8
|
Component::Gitlab.perform do |gitlab|
|
9
9
|
gitlab.release = release
|
10
10
|
gitlab.network = 'test'
|
@@ -22,7 +22,7 @@ module Gitlab
|
|
22
22
|
specs.suite = 'Test::Integration::Mattermost'
|
23
23
|
specs.release = gitlab.release
|
24
24
|
specs.network = gitlab.network
|
25
|
-
specs.args = [gitlab.address, mattermost_external_url]
|
25
|
+
specs.args = [gitlab.address, mattermost_external_url, *rspec_args]
|
26
26
|
end
|
27
27
|
end
|
28
28
|
end
|
@@ -7,7 +7,7 @@ module Gitlab
|
|
7
7
|
module Integration
|
8
8
|
class ObjectStorage < Scenario::Template
|
9
9
|
# rubocop:disable Metrics/AbcSize
|
10
|
-
def perform(release)
|
10
|
+
def perform(release, *rspec_args)
|
11
11
|
Component::Gitlab.perform do |gitlab|
|
12
12
|
gitlab.release = release
|
13
13
|
gitlab.name = 'gitlab-object-storage'
|
@@ -34,7 +34,7 @@ module Gitlab
|
|
34
34
|
specs.suite = 'Test::Integration::ObjectStorage'
|
35
35
|
specs.release = gitlab.release
|
36
36
|
specs.network = gitlab.network
|
37
|
-
specs.args = [gitlab.address]
|
37
|
+
specs.args = [gitlab.address, *rspec_args]
|
38
38
|
end
|
39
39
|
end
|
40
40
|
end
|
@@ -16,7 +16,7 @@ module Gitlab
|
|
16
16
|
# no-op
|
17
17
|
end
|
18
18
|
|
19
|
-
def perform(release)
|
19
|
+
def perform(release, *rspec_args)
|
20
20
|
release = Release.new(release)
|
21
21
|
before_perform(release)
|
22
22
|
|
@@ -37,7 +37,7 @@ module Gitlab
|
|
37
37
|
specs.suite = spec_suite
|
38
38
|
specs.release = release
|
39
39
|
specs.network = gitlab.network
|
40
|
-
specs.args = [gitlab.address]
|
40
|
+
specs.args = [gitlab.address, *rspec_args]
|
41
41
|
end
|
42
42
|
end
|
43
43
|
end
|
@@ -7,7 +7,7 @@ module Gitlab
|
|
7
7
|
module Test
|
8
8
|
module Omnibus
|
9
9
|
class Update < Scenario::Template
|
10
|
-
def perform(from_release, to_release = nil)
|
10
|
+
def perform(from_release, to_release = nil, *rspec_args)
|
11
11
|
previous_release = Release.new(from_release).previous_stable
|
12
12
|
current_release = Release.new(to_release || from_release)
|
13
13
|
|
@@ -20,7 +20,7 @@ module Gitlab
|
|
20
20
|
end
|
21
21
|
|
22
22
|
Scenario::Test::Instance::Image
|
23
|
-
.perform(current_release) do |scenario|
|
23
|
+
.perform(current_release, *rspec_args) do |scenario|
|
24
24
|
scenario.volumes = volumes
|
25
25
|
end
|
26
26
|
end
|
@@ -7,7 +7,7 @@ module Gitlab
|
|
7
7
|
module Test
|
8
8
|
module Omnibus
|
9
9
|
class Upgrade < Scenario::Template
|
10
|
-
def perform(image = 'CE')
|
10
|
+
def perform(image = 'CE', *rspec_args)
|
11
11
|
ce_release = Release.new(image)
|
12
12
|
|
13
13
|
if ce_release.ee?
|
@@ -16,12 +16,12 @@ module Gitlab
|
|
16
16
|
|
17
17
|
Docker::Volumes.new.with_temporary_volumes do |volumes|
|
18
18
|
Scenario::Test::Instance::Image
|
19
|
-
.perform(ce_release) do |scenario|
|
19
|
+
.perform(ce_release, *rspec_args) do |scenario|
|
20
20
|
scenario.volumes = volumes
|
21
21
|
end
|
22
22
|
|
23
23
|
Scenario::Test::Instance::Image
|
24
|
-
.perform(ce_release.to_ee) do |scenario|
|
24
|
+
.perform(ce_release.to_ee, *rspec_args) do |scenario|
|
25
25
|
scenario.volumes = volumes
|
26
26
|
end
|
27
27
|
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: 2.
|
4
|
+
version: 2.13.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-02-
|
11
|
+
date: 2019-02-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: climate_control
|