Skip to content

Commit 5c8e192

Browse files
committed
tests(dist): attempt to fix dist-test build
1 parent 7ad4144 commit 5c8e192

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ jobs:
121121
run: ./bin/inv_wrapper.sh dev.cc faabric_tests
122122
- name: "Run tests"
123123
run: ./bin/inv_wrapper.sh tests
124+
timeout-minutes: 15
124125

125126
dist-tests:
126127
if: github.event.pull_request.draft == false
@@ -138,6 +139,7 @@ jobs:
138139
run: ./dist-test/build.sh
139140
- name: "Run the distributed tests"
140141
run: ./dist-test/run.sh
142+
timeout-minutes: 15
141143
- name: "Print planner logs"
142144
if: always()
143145
run: docker compose logs planner

dist-test/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export PROJ_ROOT=$(dirname $(dirname $(readlink -f $0)))
66
pushd ${PROJ_ROOT} >> /dev/null
77

88
# Run the build
9+
export FAABRIC_DEPLOYMENT_TYPE=gha-ci
910
docker compose \
1011
run \
11-
-e FAABRIC_DEPLOYMENT_TYPE=gha-ci \
1212
--rm \
1313
cli \
1414
/code/faabric/dist-test/build_internal.sh

dist-test/build_internal.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pushd ${PROJ_ROOT} >> /dev/null
99
source ./bin/workon.sh
1010

1111
# Run the debug build
12-
inv dev.cmake --build=Debug
12+
inv dev.cmake --build=Debug --clean
1313
inv dev.cc faabric_dist_tests
1414
inv dev.cc faabric_dist_test_server
1515
inv dev.cc planner_server

dist-test/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ docker compose \
1616
# Run the tests directly
1717
docker compose \
1818
run \
19+
-e LOG_LEVEL=trace \
1920
--rm \
2021
cli \
2122
/build/faabric/static/bin/faabric_dist_tests

tests/dist/dist_test_fixtures.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ class MpiDistTestsFixture : public DistTestsFixture
167167
while (batchResults->messageresults_size() != worldSize) {
168168
if (numRetries >= maxRetries) {
169169
SPDLOG_ERROR(
170-
"Timed-out waiting for MPI messages results ({}/{})",
170+
"Timed-out waiting for MPI messages results (app: {}, {}/{})",
171+
req->appid(),
171172
batchResults->messageresults_size(),
172173
worldSize);
173174
throw std::runtime_error("Timed-out waiting for MPI messges");

0 commit comments

Comments
 (0)