tests(dist): attempt to fix dist-test build

faasm · Apr 8, 2024 · 63d533b · 63d533b
1 parent 7ad4144
commit 63d533b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -120,7 +120,8 @@ jobs:
       - name: "Build tests"
         run: ./bin/inv_wrapper.sh dev.cc faabric_tests
       - name: "Run tests"
-        run: ./bin/inv_wrapper.sh tests
+        run: ./bin/inv_wrapper.sh tests --debug
+        timeout-minutes: 15
 
   dist-tests:
     if: github.event.pull_request.draft == false
@@ -138,6 +139,7 @@ jobs:
         run: ./dist-test/build.sh
       - name: "Run the distributed tests"
         run: ./dist-test/run.sh
+        timeout-minutes: 15
       - name: "Print planner logs"
         if: always()
         run: docker compose logs planner

diff --git a/dist-test/build.sh b/dist-test/build.sh
@@ -6,9 +6,9 @@ export PROJ_ROOT=$(dirname $(dirname $(readlink -f $0)))
 pushd ${PROJ_ROOT} >> /dev/null
 
 # Run the build
+export FAABRIC_DEPLOYMENT_TYPE=gha-ci
 docker compose \
     run \
-    -e FAABRIC_DEPLOYMENT_TYPE=gha-ci \
     --rm \
     cli \
     /code/faabric/dist-test/build_internal.sh

diff --git a/dist-test/build_internal.sh b/dist-test/build_internal.sh
@@ -9,7 +9,7 @@ pushd ${PROJ_ROOT} >> /dev/null
 source ./bin/workon.sh
 
 # Run the debug build
-inv dev.cmake --build=Debug
+inv dev.cmake --build=Debug --clean
 inv dev.cc faabric_dist_tests
 inv dev.cc faabric_dist_test_server
 inv dev.cc planner_server

diff --git a/tests/dist/dist_test_fixtures.h b/tests/dist/dist_test_fixtures.h
@@ -167,7 +167,8 @@ class MpiDistTestsFixture : public DistTestsFixture
         while (batchResults->messageresults_size() != worldSize) {
             if (numRetries >= maxRetries) {
                 SPDLOG_ERROR(
-                  "Timed-out waiting for MPI messages results ({}/{})",
+                  "Timed-out waiting for MPI messages results (app: {}, {}/{})",
+                  req->appid(),
                   batchResults->messageresults_size(),
                   worldSize);
                 throw std::runtime_error("Timed-out waiting for MPI messges");