From 6e1f0e612a2bc0473244046f9fec0ce8a7d8b693 Mon Sep 17 00:00:00 2001
From: Alberto Madonna <alberto.madonna@cscs.ch>
Date: Tue, 29 Oct 2024 10:45:21 +0000
Subject: [PATCH] Fixed race condition in CI distributed test setup

---
 .gitlab-ci.yml        | 1 +
 CI/docker-compose.yml | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5be717d..2e7e74b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,6 +120,7 @@ coverage:
   script:
     - . ./CI/utility_docker_functions.bash Debug gcc-gcov.cmake $(pwd) $HOST_CACHES_PATH standalone-build standalone-run
     - sarus-build-and-test
+  coverage: '/^TOTAL.*\s+(\d+\%)$/'
 
 rocky8:
   extends: .from_source
diff --git a/CI/docker-compose.yml b/CI/docker-compose.yml
index b4efb37..4bab950 100644
--- a/CI/docker-compose.yml
+++ b/CI/docker-compose.yml
@@ -4,7 +4,6 @@ services:
     hostname: controller
     volumes:
       - etc-munge-volume:/etc/munge
-      - etc-slurm-volume:/etc/slurm
       - opt-sarus-volume:/opt/sarus
       - @cached_oci_hooks_dir@:/home/docker/.oci-hooks
       - @cached_local_repo_dir@:/home/docker/.sarus
@@ -29,7 +28,6 @@ services:
     hostname: server0
     volumes:
       - etc-munge-volume:/etc/munge
-      - etc-slurm-volume:/etc/slurm
       - opt-sarus-volume:/opt/sarus
       - @cached_oci_hooks_dir@:/home/docker/.oci-hooks
       - @cached_local_repo_dir@:/home/docker/.sarus
@@ -41,8 +39,10 @@ services:
         sleep 1;
       done;
       . /sarus-source/CI/utility_functions.bash
+      && . /sarus-source/CI/src/integration_tests_for_virtual_cluster/helpers.bash
       && change_uid_gid_of_docker_user @host_uid@ @host_gid@
       && /etc/init.d/munge start
+      && generate_slurm_conf /etc/slurm/slurm.conf controller server0 server1
       && touch /etc/slurm/gres.conf && echo Starting slurmd
       && slurmd -L /var/log/slurm/slurmd && echo Going to sleep
       && sleep infinity"
@@ -58,7 +58,6 @@ services:
     hostname: server1
     volumes:
       - etc-munge-volume:/etc/munge
-      - etc-slurm-volume:/etc/slurm
       - opt-sarus-volume:/opt/sarus
       - @cached_oci_hooks_dir@:/home/docker/.oci-hooks
       - @cached_local_repo_dir@:/home/docker/.sarus
@@ -70,8 +69,10 @@ services:
         sleep 1;
       done;
       . /sarus-source/CI/utility_functions.bash
+      && . /sarus-source/CI/src/integration_tests_for_virtual_cluster/helpers.bash
       && change_uid_gid_of_docker_user @host_uid@ @host_gid@
       && /etc/init.d/munge start
+      && generate_slurm_conf /etc/slurm/slurm.conf controller server0 server1
       && touch /etc/slurm/gres.conf && echo Starting slurmd
       && slurmd -L /var/log/slurm/slurmd && echo Going to sleep
       && sleep infinity"