From 4d57b1ed1915c61b11d7ca16863b4be3d4ac2201 Mon Sep 17 00:00:00 2001
From: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
Date: Mon, 24 Mar 2025 11:43:45 +0100
Subject: [PATCH] Fix random failures in pipeline

---
 .gitlab-ci.yml                   | 1 -
 gitlab-ci/functional-api-test.sh | 6 ++++--
 gitlab-ci/icwmp-base.conf        | 8 --------
 gitlab-ci/icwmp-dm.conf          | 3 +++
 gitlab-ci/setup.sh               | 2 +-
 gitlab-ci/unit-test.sh           | 5 ++---
 6 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100644 gitlab-ci/icwmp-dm.conf

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 639da4a..d3ba5e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,6 @@ include:
 stages:
   - static_code_analysis
   - pipeline_test
-    
 
 run_unit_test:
    stage: pipeline_test
diff --git a/gitlab-ci/functional-api-test.sh b/gitlab-ci/functional-api-test.sh
index 6e36369..41526a8 100755
--- a/gitlab-ci/functional-api-test.sh
+++ b/gitlab-ci/functional-api-test.sh
@@ -13,6 +13,8 @@ DROPBEAR_OBJECT='{"parent_dm": "Device.", "object": "X_IOWRT_EU_Dropbear"}'
 jq --argjson newObj "$DROPBEAR_OBJECT" '.daemon.services += [$newObj]' "/etc/bbfdm/services/core.json" > /tmp/updated_core.json
 mv /tmp/updated_core.json /etc/bbfdm/services/core.json
 
+supervisorctl restart bbfdmd
+
 echo "Compiling icmwp"
 build_icwmp
 
@@ -23,12 +25,12 @@ mkdir -p /var/log
 mkdir -p /var/state/icwmpd 
 
 echo "Starting Services..."
+cp ./gitlab-ci/icwmp-dm.conf /etc/supervisor/conf.d/
 cp ./gitlab-ci/icwmp.conf /etc/supervisor/conf.d/
 supervisorctl reread
 supervisorctl update
-supervisorctl restart bbfdmd
 sleep 20
-supervisorctl status all
+supervisorctl status
 
 echo "Checking cwmp status"
 check_cwmp_status
diff --git a/gitlab-ci/icwmp-base.conf b/gitlab-ci/icwmp-base.conf
index 035e3ca..94346b3 100644
--- a/gitlab-ci/icwmp-base.conf
+++ b/gitlab-ci/icwmp-base.conf
@@ -1,11 +1,3 @@
 [program:download]
 priority=3
 command=/bin/bash -c "cd /tmp/firmware/ && python3 -m http.server 80"
-
-[program:icwmp]
-priority=12
-command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-icwmp-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/dm-service -m icwmp"
-
-[program:bbfdmd]
-priority=15
-command=/bin/bash -c "/usr/sbin/bbfdmd"
diff --git a/gitlab-ci/icwmp-dm.conf b/gitlab-ci/icwmp-dm.conf
new file mode 100644
index 0000000..7706fcf
--- /dev/null
+++ b/gitlab-ci/icwmp-dm.conf
@@ -0,0 +1,3 @@
+[program:icwmp-dm]
+priority=12
+command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-icwmp-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/dm-service -m icwmp"
diff --git a/gitlab-ci/setup.sh b/gitlab-ci/setup.sh
index f91de6a..0240c5c 100755
--- a/gitlab-ci/setup.sh
+++ b/gitlab-ci/setup.sh
@@ -3,7 +3,7 @@
 echo "preparation script"
 pwd
 
-[ -d "/opt/dev/bbfdm" ] && cd /opt/dev/bbfdm && ./gitlab-ci/setup.sh && cd -
+[ -d "/opt/dev/bbfdm" ] && cd /opt/dev/bbfdm && ./gitlab-ci/setup.sh && cp -f ./gitlab-ci/bbfdm_services.conf /etc/supervisor/conf.d/ && cd -
 
 cp -rf ./test/files/* /
 
diff --git a/gitlab-ci/unit-test.sh b/gitlab-ci/unit-test.sh
index bbb81cd..970d973 100755
--- a/gitlab-ci/unit-test.sh
+++ b/gitlab-ci/unit-test.sh
@@ -13,14 +13,13 @@ echo "Compiling icmwp"
 build_icwmp
 
 echo "Starting dependent services"
+cp ./gitlab-ci/icwmp-dm.conf /etc/supervisor/conf.d/
 supervisorctl reread
 supervisorctl update
 sleep 2
 supervisorctl restart all
 sleep 5
-supervisorctl stop icwmpd
-sleep 5
-supervisorctl status all
+supervisorctl status
 
 ubus wait_for bbfdm