From 899f0c4a239099f8d20048bd15e654be864bfc2a Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Wed, 6 Aug 2025 14:09:03 +0530
Subject: [PATCH] Fix CI for release branch

---
 .gitlab-ci.yml                   | 1 +
 gitlab-ci/functional-api-test.sh | 1 +
 gitlab-ci/shared.sh              | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3ba5e1..290e144 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ variables:
   DEBUG: 'TRUE'
   SOURCE_FOLDER: "."
   COMPILATION_FIXUP: "cmake ."
+  BBFDM_BRANCH: 'release-7.5'
 
 include:
   - project: 'iopsys/gitlab-ci-pipeline'
diff --git a/gitlab-ci/functional-api-test.sh b/gitlab-ci/functional-api-test.sh
index 41526a8..a731618 100755
--- a/gitlab-ci/functional-api-test.sh
+++ b/gitlab-ci/functional-api-test.sh
@@ -67,6 +67,7 @@ for test in $(cat test/script/run_sequence.txt); do
 	sleep 1
 done
 
+sleep 5
 echo "Stop all services"
 supervisorctl stop icwmpd
 
diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh
index 13d01c0..d59170b 100644
--- a/gitlab-ci/shared.sh
+++ b/gitlab-ci/shared.sh
@@ -136,13 +136,15 @@ function install_bbfdmd()
 	[ -d "/opt/dev/bbfdm" ] && rm -rf /opt/dev/bbfdm
 
 	if [ -n "${BBFDM_BRANCH}" ]; then
+		export BRANCH=${BBFDM_BRANCH}
 		exec_cmd git clone -b ${BBFDM_BRANCH} https://dev.iopsys.eu/bbf/bbfdm.git /opt/dev/bbfdm
 	else
 		exec_cmd git clone https://dev.iopsys.eu/bbf/bbfdm.git /opt/dev/bbfdm
 	fi
 
 	cd /opt/dev/bbfdm
-	exec_cmd ./gitlab-ci/install-dependencies.sh install
+	./gitlab-ci/install-dependencies.sh install
+	check_ret $?
 	exec_cmd ./gitlab-ci/setup.sh install
 }