@@ -249,6 +249,10 @@ stages:
249
249
- PYTHON="$(source bin/tests/system/conf.sh; echo $PYTHON)"
250
250
- test -x "$PYTHON"
251
251
252
+ .find_pytest : &find_pytest
253
+ - PYTEST="$(source bin/tests/system/conf.sh; echo $PYTEST)"
254
+ - test -x "$PYTEST"
255
+
252
256
.parse_tsan : &parse_tsan
253
257
- find -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \;
254
258
@@ -313,6 +317,17 @@ stages:
313
317
before_script :
314
318
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
315
319
- *setup_interfaces
320
+ script :
321
+ - *find_pytest
322
+ - cd bin/tests/system
323
+ - >
324
+ "$PYTEST" --junit-xml="$CI_PROJECT_DIR"/junit.xml -n "$TEST_PARALLEL_JOBS" --dist loadscope | tee pytest.out.txt
325
+ - ' ( ! grep -F "grep: warning:" pytest.out.txt )'
326
+ after_script :
327
+ - awk '/^=+ FAILURES =+/{flag=1;next}/^=+.*=+$/{flag=0}flag' bin/tests/system/pytest.out.txt || true
328
+ - awk '/^=+ ERRORS =+/{flag=1;next}/^=+.*=+$/{flag=0}flag' bin/tests/system/pytest.out.txt || true
329
+
330
+ .system_test_legacy : &system_test_legacy
316
331
script :
317
332
- cd bin/tests/system
318
333
- make -j${TEST_PARALLEL_JOBS:-1} -k check V=1
@@ -332,6 +347,8 @@ stages:
332
347
<< : *system_test_common
333
348
artifacts :
334
349
untracked : true
350
+ exclude :
351
+ - " **/__pycache__/**/*"
335
352
when : always
336
353
reports :
337
354
junit : junit.xml
@@ -340,19 +357,24 @@ stages:
340
357
<< : *system_test_common
341
358
artifacts :
342
359
untracked : true
360
+ exclude :
361
+ - " **/__pycache__/**/*"
343
362
when : always
344
363
345
364
.system_test_tsan : &system_test_tsan_job
346
365
<< : *system_test_common
347
366
after_script :
348
- - cat bin/tests/system/test-suite.log
367
+ - awk '/^=+ FAILURES =+/{flag=1;next}/^=+.*=+$/{flag=0}flag' bin/tests/system/pytest.out.txt || true
368
+ - awk '/^=+ ERRORS =+/{flag=1;next}/^=+.*=+$/{flag=0}flag' bin/tests/system/pytest.out.txt || true
349
369
- find bin/tests/system -name "*dig.*" | xargs grep "error" || true
350
370
- *find_python
351
371
- *parse_tsan
352
372
- >
353
373
"$PYTHON" bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml
354
374
artifacts :
355
375
untracked : true
376
+ exclude :
377
+ - " **/__pycache__/**/*"
356
378
when : always
357
379
reports :
358
380
junit : junit.xml
@@ -604,6 +626,7 @@ gcc:oraclelinux7:amd64:
604
626
system:gcc:oraclelinux7:amd64 :
605
627
<< : *oraclelinux_7_amd64_image
606
628
<< : *system_test_job
629
+ << : *system_test_legacy
607
630
needs :
608
631
- job : gcc:oraclelinux7:amd64
609
632
artifacts : true
@@ -830,6 +853,7 @@ system:gcc:out-of-tree:
830
853
artifacts : true
831
854
<< : *base_image
832
855
<< : *system_test_job
856
+ << : *system_test_legacy
833
857
<< : *api_schedules_tags_triggers_web_triggering_rules
834
858
835
859
unit:gcc:out-of-tree :
@@ -1191,6 +1215,7 @@ clang:openbsd:amd64:
1191
1215
system:clang:openbsd:amd64 :
1192
1216
<< : *openbsd_amd64_image
1193
1217
<< : *system_test_job
1218
+ << : *system_test_legacy
1194
1219
<< : *api_schedules_triggers_web_triggering_rules
1195
1220
variables :
1196
1221
USER : gitlab-runner
0 commit comments