Skip to content

Commit 55bcc92

Browse files
committed
ci: Run with rerunfailures rather than flaky
1 parent dbf2f71 commit 55bcc92

File tree

3 files changed

+42
-5
lines changed

3 files changed

+42
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ env:
1616
RUST_PROFILE: release
1717
SLOW_MACHINE: 1
1818
CI_SERVER_URL: "http://35.239.136.52:3170"
19+
GLOBAL_PYTEST_OPTS: --reruns=5
1920

2021
jobs:
2122
prebuild:
@@ -313,7 +314,7 @@ jobs:
313314
run: |
314315
env
315316
cat config.vars
316-
uv run eatmydata pytest tests/test_downgrade.py -vvv -n ${PYTEST_PAR} ${PYTEST_OPTS}
317+
uv run eatmydata pytest tests/test_downgrade.py -vvv ${GLOBAL_PYTEST_OPTS} -n ${PYTEST_PAR} ${PYTEST_OPTS}
317318
318319
integration:
319320
name: Test CLN ${{ matrix.name }}
@@ -421,7 +422,7 @@ jobs:
421422
run: |
422423
env
423424
cat config.vars
424-
VALGRIND=0 uv run eatmydata pytest tests/ -vvv -n ${PYTEST_PAR} ${PYTEST_OPTS}
425+
VALGRIND=0 uv run eatmydata pytest tests/ -vvv ${GLOBAL_PYTEST_OPTS} -n ${PYTEST_PAR} ${PYTEST_OPTS}
425426
426427
integration-valgrind:
427428
name: Valgrind Test CLN ${{ matrix.name }}
@@ -430,7 +431,7 @@ jobs:
430431
env:
431432
RUST_PROFILE: release # Has to match the one in the compile step
432433
CFG: compile-gcc
433-
PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800 --durations=10
434+
PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800 --durations=10 --reruns=10
434435
needs:
435436
- compile
436437
strategy:
@@ -501,7 +502,7 @@ jobs:
501502
RUST_PROFILE: release
502503
SLOW_MACHINE: 1
503504
TEST_DEBUG: 1
504-
PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800 --durations=10
505+
PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800 --durations=10 --reruns=10
505506
needs:
506507
- compile
507508
strategy:
@@ -674,7 +675,7 @@ jobs:
674675
run: |
675676
env
676677
cat config.vars
677-
VALGRIND=0 uv run eatmydata pytest tests/ -vvv -n ${PYTEST_PAR} ${PYTEST_OPTS}
678+
VALGRIND=0 uv run eatmydata pytest tests/ -vvv ${GLOBAL_PYTEST_OPTS} -n ${PYTEST_PAR} ${PYTEST_OPTS}
678679
679680
check-flake:
680681
name: Check Nix Flake

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies = [
1616
"pyln-proto",
1717
"pyln-grpc-proto",
1818
"pytest-global-fixture",
19+
"pytest-rerunfailures>=16.0.1",
1920
]
2021
package-mode = false
2122
[dependency-groups]

uv.lock

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)