gitlab-qa 4.3.3 → 4.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/.gitlab-ci.yml +434 -284
  3. data/.rubocop.yml +0 -3
  4. data/bin/merge_html_reports +86 -0
  5. data/bin/notify_upstream_commit +16 -8
  6. data/docs/run_qa_against_gdk.md +10 -8
  7. data/docs/what_tests_can_be_run.md +8 -0
  8. data/gitlab-qa.gemspec +3 -3
  9. data/lib/gitlab/qa.rb +6 -0
  10. data/lib/gitlab/qa/component/gitlab.rb +11 -0
  11. data/lib/gitlab/qa/component/specs.rb +11 -0
  12. data/lib/gitlab/qa/component/staging.rb +4 -89
  13. data/lib/gitlab/qa/release.rb +20 -1
  14. data/lib/gitlab/qa/scenario/test/instance/deployment_base.rb +0 -11
  15. data/lib/gitlab/qa/scenario/test/integration/geo.rb +0 -1
  16. data/lib/gitlab/qa/scenario/test/integration/object_storage.rb +0 -2
  17. data/lib/gitlab/qa/support/dev_ee_qa_image.rb +52 -0
  18. data/lib/gitlab/qa/support/get_request.rb +39 -0
  19. data/lib/gitlab/qa/support/invalid_response_error.rb +9 -0
  20. data/lib/gitlab/qa/version.rb +1 -1
  21. metadata +12 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b490e047aff19f334639e7e5126a773fb9aad830469a00e45e5f9b0f0bcae4a8
4
- data.tar.gz: 35a094676936573b20a09a904cb5e63ed59d8b8a74a85529dcc31b76a10b1f5e
3
+ metadata.gz: 7942f1bc5eb93e286f301c7c834ee85af008001c4e150f46dd6369807f8fb537
4
+ data.tar.gz: 6c6557c7b1aa6a9aa3b06671d103361fdbcf95d1227135fd80ce964ee7d3e4a2
5
5
  SHA512:
6
- metadata.gz: b7ab9084af4a9103007127fb433936872d86a2fdcad15aac3a935e08791a55111f18285dd09a6ec20615fbb83704939de47884052af7ef34c9cb022baafc56c8
7
- data.tar.gz: a0d7b6d521c0f4ffe7166c1ec78afcb0068fabea12f4ed59ac9db92a7eea8ab8bb9876ff241d0f2649dc40c97f43f14fd083c01fde4d41b4ad60c0d228afc161
6
+ metadata.gz: f5fe249d81ce49644ba5383c3a3dcd2986075495781a7228a70b4996a9bc805c35dda20659c3b8d0b939a72de9373cba7676cf0760c3503acc42abb1ec871786
7
+ data.tar.gz: 050c1d7eee902b05290caa18ad10f95fa21aec09de3fa0f058974911a6b16e12377bb896a5b9da2280bea2e13d47802cecc9c08ec48cffe111f0523993d913d4
data/.gitlab-ci.yml CHANGED
@@ -37,505 +37,654 @@ check:rspec:
37
37
  tags:
38
38
  - docker
39
39
 
40
- .test: &test
40
+ .test:
41
41
  stage: test
42
42
  image: $TEST_IMAGE
43
43
  tags:
44
44
  - docker
45
45
  artifacts:
46
- when: on_failure
47
- expire_in: 30d
46
+ when: always
47
+ expire_in: 10d
48
48
  paths:
49
49
  - ./gitlab-qa-run-*
50
50
 
51
- .ce-qa: &ce-qa
51
+ .ce-qa:
52
52
  only:
53
53
  variables:
54
54
  - $RELEASE == null
55
55
  - $RELEASE =~ /gitlab-ce/
56
56
 
57
- .ee-qa: &ee-qa
57
+ .ee-qa:
58
58
  only:
59
59
  variables:
60
60
  - $RELEASE == null
61
61
  - $RELEASE =~ /gitlab-ee/
62
62
 
63
- .only-qa: &only-qa
63
+ .only-qa:
64
64
  except:
65
65
  variables:
66
66
  - $RELEASE
67
67
 
68
- .high-capacity: &high-capacity
68
+ .high-capacity:
69
69
  tags:
70
70
  - docker
71
71
  - 7gb
72
72
  - triggered-packages
73
73
 
74
- .ee-parallel-knapsack: &ee-parallel-knapsack
75
- parallel: 5
74
+ .knapsack-variables:
76
75
  variables:
77
- KNAPSACK_REPORT_PATH: "qa/ee/knapsack/nightly_master_report.json"
76
+ KNAPSACK_REPORT_PATH: "knapsack/master_report.json"
78
77
  KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/*_spec.rb"
79
78
  KNAPSACK_GENERATE_REPORT: "true"
80
79
 
81
- .ce-parallel-knapsack: &ce-parallel-knapsack
82
- parallel: 5
80
+ .rspec-report-opts:
83
81
  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"
82
+ FILE_SAFE_JOB_NAME: $(echo $CI_JOB_NAME | sed 's/[ /]/_/g')
83
+ RSPEC_REPORT_OPTS: "--format RspecJunitFormatter --out \"tmp/rspec-${CI_JOB_ID}.xml\" --format html --out \"tmp/rspec-${FILE_SAFE_JOB_NAME}.htm\" --color --format documentation"
87
84
 
88
- .quarantine: &quarantine
85
+ .quarantine:
89
86
  allow_failure: true
90
87
 
91
88
  ce:sanity-framework:
92
89
  script:
93
90
  - ./bin/expect_exit_code_and_text "exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure"
94
- <<: *test
95
- <<: *high-capacity
96
- <<: *ce-qa
91
+ extends:
92
+ - .test
93
+ - .high-capacity
94
+ - .ce-qa
97
95
 
98
96
  ee:sanity-framework:
99
97
  script:
100
98
  - ./bin/expect_exit_code_and_text "exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag framework" 1 "2 examples, 1 failure"
101
- <<: *test
102
- <<: *high-capacity
103
- <<: *ee-qa
99
+ extends:
100
+ - .test
101
+ - .high-capacity
102
+ - .ee-qa
104
103
 
105
104
  ce:instance:
106
105
  script:
107
- - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE}
108
- <<: *test
109
- <<: *high-capacity
110
- <<: *ce-qa
111
- <<: *ce-parallel-knapsack
106
+ - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
107
+ extends:
108
+ - .test
109
+ - .high-capacity
110
+ - .ce-qa
111
+ - .knapsack-variables
112
+ - .rspec-report-opts
113
+ parallel: 5
112
114
 
113
115
  ce:instance-quarantine:
114
116
  script:
115
- - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated
116
- <<: *test
117
- <<: *high-capacity
118
- <<: *ce-qa
119
- <<: *quarantine
117
+ - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
118
+ extends:
119
+ - .test
120
+ - .high-capacity
121
+ - .ce-qa
122
+ - .quarantine
123
+ - .rspec-report-opts
120
124
 
121
125
  ee:instance:
122
126
  script:
123
- - exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE}
124
- <<: *test
125
- <<: *high-capacity
126
- <<: *ee-qa
127
- <<: *ee-parallel-knapsack
127
+ - exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
128
+ extends:
129
+ - .test
130
+ - .high-capacity
131
+ - .ee-qa
132
+ - .knapsack-variables
133
+ - .rspec-report-opts
134
+ parallel: 5
128
135
 
129
136
  ee:instance-quarantine:
130
137
  script:
131
- - exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated
132
- <<: *test
133
- <<: *high-capacity
134
- <<: *ee-qa
135
- <<: *quarantine
138
+ - exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
139
+ extends:
140
+ - .test
141
+ - .high-capacity
142
+ - .ee-qa
143
+ - .quarantine
144
+ - .rspec-report-opts
136
145
 
137
146
  ce:docker:
138
147
  script:
139
- - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag docker
140
- <<: *test
141
- <<: *high-capacity
142
- <<: *ce-qa
148
+ - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag docker $RSPEC_REPORT_OPTS
149
+ extends:
150
+ - .test
151
+ - .high-capacity
152
+ - .ce-qa
153
+ - .rspec-report-opts
143
154
 
144
155
  ee:docker:
145
156
  script:
146
- - exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag docker
147
- <<: *test
148
- <<: *high-capacity
149
- <<: *ee-qa
157
+ - exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag docker $RSPEC_REPORT_OPTS
158
+ extends:
159
+ - .test
160
+ - .high-capacity
161
+ - .ee-qa
162
+ - .rspec-report-opts
150
163
 
151
164
  ce:relative_url:
152
165
  script:
153
- - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=CE}
154
- <<: *test
155
- <<: *high-capacity
156
- <<: *ce-qa
157
- <<: *ce-parallel-knapsack
166
+ - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
167
+ extends:
168
+ - .test
169
+ - .high-capacity
170
+ - .ce-qa
171
+ - .knapsack-variables
172
+ - .rspec-report-opts
173
+ parallel: 5
158
174
 
159
175
  ce:relative_url-quarantine:
160
176
  script:
161
- - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated
162
- <<: *test
163
- <<: *high-capacity
164
- <<: *ce-qa
165
- <<: *quarantine
177
+ - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
178
+ extends:
179
+ - .test
180
+ - .high-capacity
181
+ - .ce-qa
182
+ - .quarantine
183
+ - .rspec-report-opts
166
184
 
167
185
  ee:relative_url:
168
186
  script:
169
- - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=EE}
170
- <<: *test
171
- <<: *high-capacity
172
- <<: *ee-qa
173
- <<: *ee-parallel-knapsack
187
+ - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
188
+ extends:
189
+ - .test
190
+ - .high-capacity
191
+ - .ee-qa
192
+ - .knapsack-variables
193
+ - .rspec-report-opts
194
+ parallel: 5
174
195
 
175
196
  ee:relative_url-quarantine:
176
197
  script:
177
- - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated
178
- <<: *test
179
- <<: *high-capacity
180
- <<: *ee-qa
181
- <<: *quarantine
198
+ - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
199
+ extends:
200
+ - .test
201
+ - .high-capacity
202
+ - .ee-qa
203
+ - .quarantine
204
+ - .rspec-report-opts
182
205
 
183
206
  ce:image:
184
207
  script:
185
208
  - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=CE}
186
- <<: *test
187
- <<: *ce-qa
209
+ extends:
210
+ - .test
211
+ - .ce-qa
188
212
 
189
213
  ee:image:
190
214
  script:
191
215
  - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=EE}
192
- <<: *test
193
- <<: *ee-qa
216
+ extends:
217
+ - .test
218
+ - .ee-qa
194
219
 
195
220
  ce:update:
196
221
  script:
197
- - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE}
198
- <<: *test
199
- <<: *high-capacity
200
- <<: *ce-qa
201
- <<: *ce-parallel-knapsack
222
+ - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
223
+ extends:
224
+ - .test
225
+ - .high-capacity
226
+ - .ce-qa
227
+ - .rspec-report-opts
228
+ - .knapsack-variables
229
+ parallel: 5
202
230
 
203
231
  ce:update-quarantine:
204
232
  script:
205
- - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated
206
- <<: *test
207
- <<: *high-capacity
208
- <<: *ce-qa
209
- <<: *quarantine
233
+ - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
234
+ extends:
235
+ - .test
236
+ - .high-capacity
237
+ - .ce-qa
238
+ - .quarantine
239
+ - .rspec-report-opts
210
240
 
211
241
  ee:update:
212
242
  script:
213
- - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE}
214
- <<: *test
215
- <<: *high-capacity
216
- <<: *ee-qa
217
- <<: *ee-parallel-knapsack
243
+ - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
244
+ extends:
245
+ - .test
246
+ - .high-capacity
247
+ - .ee-qa
248
+ - .rspec-report-opts
249
+ - .knapsack-variables
250
+ parallel: 5
218
251
 
219
252
  ee:update-quarantine:
220
253
  script:
221
- - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated
222
- <<: *test
223
- <<: *high-capacity
224
- <<: *ee-qa
225
- <<: *quarantine
254
+ - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
255
+ extends:
256
+ - .test
257
+ - .high-capacity
258
+ - .ee-qa
259
+ - .quarantine
260
+ - .rspec-report-opts
226
261
 
227
262
  ce:upgrade:
228
263
  script:
229
- - exe/gitlab-qa Test::Omnibus::Upgrade
230
- <<: *test
231
- <<: *high-capacity
232
- <<: *only-qa
264
+ - exe/gitlab-qa Test::Omnibus::Upgrade CE -- $RSPEC_REPORT_OPTS
265
+ extends:
266
+ - .test
267
+ - .high-capacity
268
+ - .only-qa
269
+ - .rspec-report-opts
270
+ - .knapsack-variables
271
+ parallel: 5
233
272
 
234
273
  ce:upgrade-quarantine:
235
274
  script:
236
- - exe/gitlab-qa Test::Omnibus::Upgrade CE -- --tag quarantine --tag ~orchestrated
237
- <<: *test
238
- <<: *high-capacity
239
- <<: *only-qa
240
- <<: *quarantine
275
+ - exe/gitlab-qa Test::Omnibus::Upgrade CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
276
+ extends:
277
+ - .test
278
+ - .high-capacity
279
+ - .only-qa
280
+ - .quarantine
281
+ - .rspec-report-opts
241
282
 
242
283
  ee-previous-to-ce:update:
243
284
  script:
244
- - exe/gitlab-qa Test::Omnibus::Update EE CE
245
- <<: *test
246
- <<: *high-capacity
247
- <<: *only-qa
285
+ - exe/gitlab-qa Test::Omnibus::Update EE CE -- $RSPEC_REPORT_OPTS
286
+ extends:
287
+ - .test
288
+ - .high-capacity
289
+ - .only-qa
290
+ - .rspec-report-opts
248
291
 
249
292
  ee-previous-to-ce:update-quarantine:
250
293
  script:
251
- - exe/gitlab-qa Test::Omnibus::Update EE CE -- --tag quarantine --tag ~orchestrated
252
- <<: *test
253
- <<: *high-capacity
254
- <<: *only-qa
255
- <<: *quarantine
294
+ - exe/gitlab-qa Test::Omnibus::Update EE CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
295
+ extends:
296
+ - .test
297
+ - .high-capacity
298
+ - .only-qa
299
+ - .quarantine
300
+ - .rspec-report-opts
256
301
 
257
302
  ce:mattermost:
258
303
  script:
259
- - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=CE}
260
- <<: *test
261
- <<: *high-capacity
262
- <<: *ce-qa
304
+ - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
305
+ extends:
306
+ - .test
307
+ - .high-capacity
308
+ - .ce-qa
309
+ - .rspec-report-opts
263
310
 
264
311
  ce:mattermost-quarantine:
265
312
  script:
266
- - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=CE} -- --tag quarantine
267
- <<: *test
268
- <<: *high-capacity
269
- <<: *ce-qa
270
- <<: *quarantine
313
+ - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
314
+ extends:
315
+ - .test
316
+ - .high-capacity
317
+ - .ce-qa
318
+ - .quarantine
319
+ - .rspec-report-opts
271
320
 
272
321
  ee:mattermost:
273
322
  script:
274
- - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=EE}
275
- <<: *test
276
- <<: *high-capacity
277
- <<: *ee-qa
323
+ - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
324
+ extends:
325
+ - .test
326
+ - .high-capacity
327
+ - .ee-qa
328
+ - .rspec-report-opts
278
329
 
279
330
  ee:mattermost-quarantine:
280
331
  script:
281
- - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=EE} -- --tag quarantine
282
- <<: *test
283
- <<: *high-capacity
284
- <<: *ee-qa
285
- <<: *quarantine
332
+ - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
333
+ extends:
334
+ - .test
335
+ - .high-capacity
336
+ - .ee-qa
337
+ - .quarantine
338
+ - .rspec-report-opts
286
339
 
287
340
  ee:geo:
288
341
  script:
289
- - exe/gitlab-qa Test::Integration::Geo ${RELEASE:=EE}
290
- <<: *test
291
- <<: *high-capacity
292
- <<: *ee-qa
342
+ - exe/gitlab-qa Test::Integration::Geo ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
343
+ extends:
344
+ - .test
345
+ - .high-capacity
346
+ - .ee-qa
347
+ - .rspec-report-opts
293
348
 
294
349
  ee:geo-quarantine:
295
350
  script:
296
- - exe/gitlab-qa Test::Integration::Geo ${RELEASE:=EE} -- --tag quarantine
297
- <<: *test
298
- <<: *high-capacity
299
- <<: *ee-qa
300
- <<: *quarantine
351
+ - exe/gitlab-qa Test::Integration::Geo ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
352
+ extends:
353
+ - .test
354
+ - .high-capacity
355
+ - .ee-qa
356
+ - .quarantine
357
+ - .rspec-report-opts
301
358
 
302
359
  ce:ldap_no_tls:
303
360
  script:
304
- - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=CE}
305
- <<: *test
306
- <<: *high-capacity
307
- <<: *ce-qa
361
+ - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
362
+ extends:
363
+ - .test
364
+ - .high-capacity
365
+ - .ce-qa
366
+ - .rspec-report-opts
308
367
 
309
368
  ce:ldap_no_tls-quarantine:
310
369
  script:
311
- - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=CE} -- --tag quarantine
312
- <<: *test
313
- <<: *high-capacity
314
- <<: *ce-qa
315
- <<: *quarantine
370
+ - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
371
+ extends:
372
+ - .test
373
+ - .high-capacity
374
+ - .ce-qa
375
+ - .quarantine
376
+ - .rspec-report-opts
316
377
 
317
378
  ee:ldap_no_tls:
318
379
  script:
319
- - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=EE}
320
- <<: *test
321
- <<: *high-capacity
322
- <<: *ee-qa
380
+ - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
381
+ extends:
382
+ - .test
383
+ - .high-capacity
384
+ - .ee-qa
385
+ - .rspec-report-opts
323
386
 
324
387
  ee:ldap_no_tls-quarantine:
325
388
  script:
326
- - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=EE} -- --tag quarantine
327
- <<: *test
328
- <<: *high-capacity
329
- <<: *ee-qa
330
- <<: *quarantine
389
+ - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
390
+ extends:
391
+ - .test
392
+ - .high-capacity
393
+ - .ee-qa
394
+ - .quarantine
395
+ - .rspec-report-opts
331
396
 
332
397
  ce:ldap_tls:
333
398
  script:
334
- - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=CE}
335
- <<: *test
336
- <<: *high-capacity
337
- <<: *ce-qa
399
+ - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
400
+ extends:
401
+ - .test
402
+ - .high-capacity
403
+ - .ce-qa
404
+ - .rspec-report-opts
338
405
 
339
406
  ce:ldap_tls-quarantine:
340
407
  script:
341
- - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=CE} -- --tag quarantine
342
- <<: *test
343
- <<: *high-capacity
344
- <<: *ce-qa
345
- <<: *quarantine
408
+ - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
409
+ extends:
410
+ - .test
411
+ - .high-capacity
412
+ - .ce-qa
413
+ - .quarantine
414
+ - .rspec-report-opts
346
415
 
347
416
  ee:ldap_tls:
348
417
  script:
349
- - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=EE}
350
- <<: *test
351
- <<: *high-capacity
352
- <<: *ee-qa
418
+ - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
419
+ extends:
420
+ - .test
421
+ - .high-capacity
422
+ - .ee-qa
423
+ - .rspec-report-opts
353
424
 
354
425
  ee:ldap_tls-quarantine:
355
426
  script:
356
- - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=EE} -- --tag quarantine
357
- <<: *test
358
- <<: *high-capacity
359
- <<: *ee-qa
360
- <<: *quarantine
427
+ - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
428
+ extends:
429
+ - .test
430
+ - .high-capacity
431
+ - .ee-qa
432
+ - .quarantine
433
+ - .rspec-report-opts
361
434
 
362
435
  ee:ldap_no_server:
363
436
  script:
364
- - exe/gitlab-qa Test::Integration::LDAPNoServer ${RELEASE:=EE}
365
- <<: *test
366
- <<: *high-capacity
367
- <<: *ee-qa
437
+ - exe/gitlab-qa Test::Integration::LDAPNoServer ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
438
+ extends:
439
+ - .test
440
+ - .high-capacity
441
+ - .ee-qa
442
+ - .rspec-report-opts
368
443
 
369
444
  ee:ldap_no_server-quarantine:
370
445
  script:
371
- - exe/gitlab-qa Test::Integration::LDAPNoServer ${RELEASE:=EE} -- --tag quarantine
372
- <<: *test
373
- <<: *high-capacity
374
- <<: *ee-qa
375
- <<: *quarantine
446
+ - exe/gitlab-qa Test::Integration::LDAPNoServer ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
447
+ extends:
448
+ - .test
449
+ - .high-capacity
450
+ - .ee-qa
451
+ - .quarantine
452
+ - .rspec-report-opts
376
453
 
377
454
  ce:instance_saml:
378
455
  script:
379
- - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=CE}
380
- <<: *test
381
- <<: *high-capacity
382
- <<: *ce-qa
456
+ - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
457
+ extends:
458
+ - .test
459
+ - .high-capacity
460
+ - .ce-qa
461
+ - .rspec-report-opts
383
462
 
384
463
  ce:instance_saml-quarantine:
385
464
  script:
386
- - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=CE} -- --tag quarantine
387
- <<: *test
388
- <<: *high-capacity
389
- <<: *ce-qa
390
- <<: *quarantine
465
+ - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
466
+ extends:
467
+ - .test
468
+ - .high-capacity
469
+ - .ce-qa
470
+ - .quarantine
471
+ - .rspec-report-opts
391
472
 
392
473
  ee:instance_saml:
393
474
  script:
394
- - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=EE}
395
- <<: *test
396
- <<: *high-capacity
397
- <<: *ee-qa
475
+ - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
476
+ extends:
477
+ - .test
478
+ - .high-capacity
479
+ - .ee-qa
480
+ - .rspec-report-opts
398
481
 
399
482
  ee:instance_saml-quarantine:
400
483
  script:
401
- - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=EE} -- --tag quarantine
402
- <<: *test
403
- <<: *high-capacity
404
- <<: *ee-qa
405
- <<: *quarantine
484
+ - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
485
+ extends:
486
+ - .test
487
+ - .high-capacity
488
+ - .ee-qa
489
+ - .quarantine
490
+ - .rspec-report-opts
406
491
 
407
492
  ee:group_saml:
408
493
  script:
409
- - exe/gitlab-qa Test::Integration::GroupSAML ${RELEASE:=EE}
410
- <<: *test
411
- <<: *high-capacity
412
- <<: *ee-qa
494
+ - exe/gitlab-qa Test::Integration::GroupSAML ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
495
+ extends:
496
+ - .test
497
+ - .high-capacity
498
+ - .ee-qa
499
+ - .rspec-report-opts
413
500
 
414
501
  ee:group_saml-quarantine:
415
502
  script:
416
- - exe/gitlab-qa Test::Integration::GroupSAML ${RELEASE:=EE} -- --tag quarantine
417
- <<: *test
418
- <<: *high-capacity
419
- <<: *ee-qa
420
- <<: *quarantine
503
+ - exe/gitlab-qa Test::Integration::GroupSAML ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
504
+ extends:
505
+ - .test
506
+ - .high-capacity
507
+ - .ee-qa
508
+ - .quarantine
509
+ - .rspec-report-opts
421
510
 
422
511
  ce:kubernetes:
423
512
  script:
424
- - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=CE}
425
- <<: *test
426
- <<: *high-capacity
427
- <<: *ce-qa
513
+ - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
514
+ extends:
515
+ - .test
516
+ - .high-capacity
517
+ - .ce-qa
518
+ - .rspec-report-opts
428
519
 
429
520
  ce:kubernetes-quarantine:
430
521
  script:
431
- - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=CE} -- --tag quarantine
432
- <<: *test
433
- <<: *high-capacity
434
- <<: *ce-qa
435
- <<: *quarantine
522
+ - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
523
+ extends:
524
+ - .test
525
+ - .high-capacity
526
+ - .ce-qa
527
+ - .quarantine
528
+ - .rspec-report-opts
436
529
 
437
530
  ee:kubernetes:
438
531
  script:
439
- - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=EE}
440
- <<: *test
441
- <<: *high-capacity
442
- <<: *ee-qa
532
+ - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
533
+ extends:
534
+ - .test
535
+ - .high-capacity
536
+ - .ee-qa
537
+ - .rspec-report-opts
443
538
 
444
539
  ee:kubernetes-quarantine:
445
540
  script:
446
- - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=EE} -- --tag quarantine
447
- <<: *test
448
- <<: *high-capacity
449
- <<: *ee-qa
450
- <<: *quarantine
541
+ - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
542
+ extends:
543
+ - .test
544
+ - .high-capacity
545
+ - .ee-qa
546
+ - .quarantine
547
+ - .rspec-report-opts
451
548
 
452
549
  ce:object_storage:
453
550
  script:
454
- - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=CE}
455
- <<: *test
456
- <<: *high-capacity
457
- <<: *ce-qa
551
+ - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
552
+ extends:
553
+ - .test
554
+ - .high-capacity
555
+ - .ce-qa
556
+ - .rspec-report-opts
458
557
 
459
558
  ce:object_storage-quarantine:
460
559
  script:
461
- - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=CE} -- --tag quarantine
462
- <<: *test
463
- <<: *high-capacity
464
- <<: *ce-qa
465
- <<: *quarantine
560
+ - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
561
+ extends:
562
+ - .test
563
+ - .high-capacity
564
+ - .ce-qa
565
+ - .quarantine
566
+ - .rspec-report-opts
466
567
 
467
568
  ee:object_storage:
468
569
  script:
469
- - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=EE}
470
- <<: *test
471
- <<: *high-capacity
472
- <<: *ee-qa
570
+ - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
571
+ extends:
572
+ - .test
573
+ - .high-capacity
574
+ - .ee-qa
575
+ - .rspec-report-opts
473
576
 
474
577
  ee:object_storage-quarantine:
475
578
  script:
476
- - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=EE} -- --tag quarantine
477
- <<: *test
478
- <<: *high-capacity
479
- <<: *ee-qa
480
- <<: *quarantine
579
+ - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
580
+ extends:
581
+ - .test
582
+ - .high-capacity
583
+ - .ee-qa
584
+ - .quarantine
585
+ - .rspec-report-opts
481
586
 
482
587
  ce:oauth:
483
588
  script:
484
- - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=CE}
485
- <<: *test
486
- <<: *high-capacity
487
- <<: *ce-qa
589
+ - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
590
+ extends:
591
+ - .test
592
+ - .high-capacity
593
+ - .ce-qa
594
+ - .rspec-report-opts
488
595
 
489
596
  ce:oauth-quarantine:
490
597
  script:
491
- - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=CE} -- --tag quarantine
492
- <<: *test
493
- <<: *high-capacity
494
- <<: *ce-qa
495
- <<: *quarantine
598
+ - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
599
+ extends:
600
+ - .test
601
+ - .high-capacity
602
+ - .ce-qa
603
+ - .quarantine
604
+ - .rspec-report-opts
496
605
 
497
606
  ee:oauth:
498
607
  script:
499
- - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=EE}
500
- <<: *test
501
- <<: *high-capacity
502
- <<: *ee-qa
608
+ - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
609
+ extends:
610
+ - .test
611
+ - .high-capacity
612
+ - .ee-qa
613
+ - .rspec-report-opts
503
614
 
504
615
  ee:oauth-quarantine:
505
616
  script:
506
- - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=EE} -- --tag quarantine
507
- <<: *test
508
- <<: *high-capacity
509
- <<: *ee-qa
510
- <<: *quarantine
617
+ - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
618
+ extends:
619
+ - .test
620
+ - .high-capacity
621
+ - .ee-qa
622
+ - .quarantine
623
+ - .rspec-report-opts
511
624
 
512
625
  ee:elasticsearch:
513
626
  script:
514
- - exe/gitlab-qa Test::Integration::Elasticsearch ${RELEASE:=EE}
515
- <<: *test
516
- <<: *high-capacity
517
- <<: *ee-qa
518
-
519
- .notify_upstream_commit: &notify_upstream_commit
520
- stage: notify
521
- image: $TEST_IMAGE
627
+ - exe/gitlab-qa Test::Integration::Elasticsearch ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
628
+ extends:
629
+ - .test
630
+ - .high-capacity
631
+ - .ee-qa
632
+ - .rspec-report-opts
633
+
634
+ ee:elasticsearch-quarantine:
635
+ script:
636
+ - exe/gitlab-qa Test::Integration::Elasticsearch ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
637
+ extends:
638
+ - .test
639
+ - .high-capacity
640
+ - .ee-qa
641
+ - .quarantine
642
+ - .rspec-report-opts
643
+
644
+ .report-base:
645
+ image: ruby:2.6-alpine
646
+ variables:
647
+ BASE_ARTIFACT_URL: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/file/"
648
+ COMBINED_REPORT: combined-report.html
649
+ artifacts:
650
+ when: always
651
+ paths:
652
+ - gitlab-qa-run-*
653
+ - combined-report.html
654
+ reports:
655
+ junit: gitlab-qa-run-*/**/rspec-*.xml
656
+ allow_failure: true
657
+ when: always
522
658
  before_script:
523
- - gem install gitlab --no-document
524
- only:
659
+ - apk add --update build-base libxml2-dev libxslt-dev git && rm -rf /var/cache/apk/*
660
+ - gem install nokogiri gitlab --no-document
661
+ - cd gitlab-qa-run-*/gitlab-*
662
+ - ARTIFACT_DIRS=$(pwd |rev| awk -F / '{print $1,$2}' | rev | sed s_\ _/_)
663
+ - cd -
664
+ - '[[ -f $COMBINED_REPORT ]] || echo "{}" > ${COMBINED_REPORT}'
665
+ - bin/merge_html_reports ${COMBINED_REPORT} ${BASE_ARTIFACT_URL}${ARTIFACT_DIRS} gitlab-qa-run-*/**/rspec-*.htm
666
+
667
+ .notify_upstream_commit:
668
+ stage: notify
669
+ except:
525
670
  variables:
526
- - $TOP_UPSTREAM_SOURCE_PROJECT
527
- - $TOP_UPSTREAM_SOURCE_SHA
671
+ - $TOP_UPSTREAM_SOURCE_PROJECT == null
672
+ - $TOP_UPSTREAM_SOURCE_SHA == null
528
673
 
529
674
  notify_upstream_commit:success:
530
- <<: *notify_upstream_commit
675
+ extends:
676
+ - .report-base
677
+ - .notify_upstream_commit
531
678
  script:
532
- - bin/notify_upstream_commit success
679
+ - bin/notify_upstream_commit success ${COMBINED_REPORT}
533
680
  when: on_success
534
681
 
535
682
  notify_upstream_commit:failure:
536
- <<: *notify_upstream_commit
683
+ extends:
684
+ - .report-base
685
+ - .notify_upstream_commit
537
686
  script:
538
- - bin/notify_upstream_commit failure
687
+ - bin/notify_upstream_commit failure ${COMBINED_REPORT}
539
688
  when: on_failure
540
689
 
541
690
  # This job requires the `GITLAB_QA_ACCESS_TOKEN` and `GITLAB_QA_DEV_ACCESS_TOKEN`
@@ -544,7 +693,8 @@ staging:
544
693
  script:
545
694
  - unset EE_LICENSE
546
695
  - exe/gitlab-qa Test::Instance::Staging
547
- <<: *test
548
- <<: *high-capacity
549
- <<: *only-qa
696
+ extends:
697
+ - .test
698
+ - .high-capacity
699
+ - .only-qa
550
700
  when: manual