From d08035acaca84bb44612eee2a1760204c062bdef Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Fri, 21 Nov 2025 12:02:30 +0530
Subject: [PATCH] Fix CI/CD pipeline

---
 gitlab-ci/install-dependencies-ms.sh | 8 +++++---
 gitlab-ci/install-dependencies.sh    | 2 ++
 gitlab-ci/shared.sh                  | 5 ++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gitlab-ci/install-dependencies-ms.sh b/gitlab-ci/install-dependencies-ms.sh
index 5dc20199..1b72629e 100755
--- a/gitlab-ci/install-dependencies-ms.sh
+++ b/gitlab-ci/install-dependencies-ms.sh
@@ -8,15 +8,17 @@ source ./gitlab-ci/shared.sh
 exec_cmd apt update
 exec_cmd pip3 install xlwt
 
+mkdir -p /etc/bbfdm/dmmap
 # Create directories for micro-service configuration and shared files
 [ ! -d "${BBFDM_MS_CONF}" ] && mkdir -p "${BBFDM_MS_CONF}"
 [ ! -d "${BBFDM_MS_DIR}" ] && mkdir -p "${BBFDM_MS_DIR}"
 
 # Clean up generated files
-rm -rf ${BBFDM_MS_DIR}/*
-rm -f ${BBFDM_MS_CONF}/*
-rm -f ${BBFDM_DMMAP_DIR}/*
+rm -rf "${BBFDM_MS_DIR:?}"/*
+rm -f "${BBFDM_MS_CONF}"/*
+rm -f "${BBFDM_DMMAP_DIR}"/*
 
+install_libeasy
 # compile and install Core Data Model as a micro-service
 install_libbbf ${1}
 
diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh
index 7b610380..e5cb9872 100755
--- a/gitlab-ci/install-dependencies.sh
+++ b/gitlab-ci/install-dependencies.sh
@@ -8,6 +8,7 @@ source ./gitlab-ci/shared.sh
 exec_cmd apt update
 exec_cmd pip3 install xlwt
 
+mkdir -p /etc/bbfdm/dmmap
 # Create directories for micro-service configuration and shared files
 [ ! -d "${BBFDM_MS_CONF}" ] && mkdir -p "${BBFDM_MS_CONF}"
 [ ! -d "${BBFDM_MS_DIR}" ] && mkdir -p "${BBFDM_MS_DIR}"
@@ -17,6 +18,7 @@ rm -rf ${BBFDM_MS_DIR}/*
 rm -f ${BBFDM_MS_CONF}/*
 rm -f ${BBFDM_DMMAP_DIR}/*
 
+install_libeasy
 # compile and install Core Data Model as a micro-service
 install_libbbf ${1}
 
diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh
index bfb26f6c..bfc314bf 100755
--- a/gitlab-ci/shared.sh
+++ b/gitlab-ci/shared.sh
@@ -139,10 +139,9 @@ function install_libeasy()
 	(
 
 		cd ${BBFDM_PLUGIN_DEST}/libeasy
+		exec_cmd cmake -DCMAKE_INSTALL_PREFIX=/usr .
 		exec_cmd make
-		sudo mkdir -p /usr/include/easy
-		sudo cp -a libeasy*.so* /usr/lib
-		sudo cp -a *.h /usr/include/easy/
+		exec_cmd make install
 	)
 }