Skip to content

Fix CI timeouts 🤞 #4458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connorjward merged 4 commits into from
Jul 24, 2025
Merged

Fix CI timeouts 🤞 #4458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b48a8d
Double all timeouts in CI
connorjward Jul 23, 2025
225ce3b
Revert "Double all timeouts in CI"
connorjward Jul 23, 2025
60e18cf
Do not use 'mpiexec -n 1' for serial tests
connorjward Jul 23, 2025
ca388d1
modify timeouts
connorjward Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ jobs:
: # Use pytest-xdist here so we can have a single collated output (not possible
: # for parallel tests)
firedrake-run-split-tests 1 1 -n 8 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/tsfc
timeout-minutes: 60
timeout-minutes: 10

- name: Run PyOP2 tests
if: inputs.run_tests && (success() || steps.install.conclusion == 'success')
Expand All @@ -245,7 +245,7 @@ jobs:
firedrake-run-split-tests 2 4 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/pyop2
firedrake-run-split-tests 3 2 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/pyop2
firedrake-run-split-tests 4 2 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/pyop2
timeout-minutes: 15
timeout-minutes: 10


- name: Run Firedrake tests (nprocs = 1)
Expand All @@ -255,14 +255,14 @@ jobs:
: # Use pytest-xdist here so we can have a single collated output (not possible
: # for parallel tests)
firedrake-run-split-tests 1 1 -n 8 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
timeout-minutes: 60
timeout-minutes: 90

- name: Run tests (nprocs = 2)
if: inputs.run_tests && (success() || steps.install.conclusion == 'success')
run: |
. venv/bin/activate
firedrake-run-split-tests 2 4 "$EXTRA_PYTEST_ARGS" firedrake-repo/tests/firedrake
timeout-minutes: 30
timeout-minutes: 60

- name: Run tests (nprocs = 3)
if: inputs.run_tests && (success() || steps.install.conclusion == 'success')
Expand Down
9 changes: 7 additions & 2 deletions scripts/firedrake-run-split-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,14 @@ extra_args=${@:3}
cache_cmd="PYOP2_CACHE_DIR=\$VIRTUAL_ENV/.cache/pyop2/job{#} \
FIREDRAKE_TSFC_KERNEL_CACHE_DIR=\$VIRTUAL_ENV/.cache/tsfc/job{#}"

pytest_exec="mpiexec -n ${num_procs} python -m pytest"
if [ $num_procs = 1 ]; then
# Cannot use mpiexec -n 1 because this can sometimes hang with
# OpenMPI at MPI_Finalize
pytest_exec="python3 -m pytest"
else
pytest_exec="mpiexec -n ${num_procs} python3 -m pytest"
fi
marker_spec="parallel[${num_procs}]"

pytest_cmd="${pytest_exec} -v \
--splits ${num_jobs} --group {#} \
-m ${marker_spec} ${extra_args}"
Expand Down
Loading