CI: better identification of deps sections

Signed-off-by: Raphael Defosseux <raphael.defosseux@openairinterface.org>

build/scripts/build_helper.fb_folly

@@ -31,6 +31,7 @@ source $THIS_SCRIPT_PATH/build_helper
 #arg1 is force (0 or 1) (no interactive script)
 #arg2 is debug (0 or 1) (install debug libraries)
 install_fb_folly_from_source(){
+  echo "Starting to install folly"
   if [ $1 -eq 0 ]; then
     OPTION=""
     read -p "Do you want to install FaceBook folly (github)? <y/N> " prompt
@@ -141,6 +142,6 @@ install_fb_folly_from_source(){
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     popd
   fi
-  echo_success "End of folly installation"
+  echo_success "folly installation complete"
   return 0
 }

build/scripts/build_helper.smf

@@ -37,6 +37,7 @@ source $THIS_SCRIPT_PATH/build_helper.fb_folly
 #arg1 is force (0 or 1) (no interactive script)
 #arg2 is debug (0 or 1) (install debug libraries)
 install_fmt() {
+  echo "Starting to install fmt"
   if [ $1 -eq 0 ]; then
     read -p "Do you want to install open-source formatting library for C++ ? <y/N> " prompt
     OPTION=""
@@ -65,6 +66,7 @@ install_fmt() {
     cd /tmp
     rm -rf /tmp/fmt*
   fi
+  echo "fmt installation complete"
   return 0
 }
 
@@ -72,6 +74,7 @@ install_fmt() {
 #arg1 is force (0 or 1) (no interactive script)
 #arg2 is debug (0 or 1) (install debug libraries)
 install_spdlog_from_git() {
+  echo "Starting to install spdlog"
   if [ $1 -eq 0 ]; then
     read -p "Do you want to install spdlog ? <y/N> " prompt
     OPTION=""
@@ -104,6 +107,7 @@ install_spdlog_from_git() {
     sed -i '/#define SPDLOG_ENABLE_SYSLOG/s/^\/\///g' include/spdlog/tweakme.h
     popd
   fi
+  echo "spdlog installation complete"
   return 0
 }
 
@@ -111,6 +115,7 @@ install_spdlog_from_git() {
 #arg1 is force (0 or 1) (no interactive script)
 #arg2 is debug (0 or 1) (install debug libraries)
 install_pistache_from_git() {
+  echo "Starting to install pistache"
   if [ $1 -eq 0 ]; then
     read -p "Do you want to install Pistache ? <y/N> " prompt
     OPTION="-y"
@@ -153,6 +158,7 @@ install_pistache_from_git() {
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     popd
   fi
+  echo "pistache installation complete"
   return 0
 }
 
@@ -160,6 +166,7 @@ install_pistache_from_git() {
 #arg1 is force (0 or 1) (no interactive script)
 #arg2 is debug (0 or 1) (install debug libraries)
 install_nlohmann_from_git() {
+  echo "Starting to install Nlohmann Json"
   if [ $1 -eq 0 ]; then
     read -p "Do you want to install Nlohmann Json ? <y/N> " prompt
     OPTION=""
@@ -198,6 +205,7 @@ install_nlohmann_from_git() {
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     popd
   fi
+  echo "Nlohmann Json installation complete"
   return 0
 }
 
@@ -205,6 +213,7 @@ install_nlohmann_from_git() {
 #arg1 is force (0 or 1) (no interactive script)
 #arg2 is debug (0 or 1) (install debug libraries)
 install_nghttp2_from_git() {
+  echo "Starting to install nghttp2"
   if [ $1 -eq 0 ]; then
     read -p "Do you want to install nghttp2 ? <y/N> " prompt
     OPTION=""
@@ -286,6 +295,7 @@ install_nghttp2_from_git() {
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     popd
   fi
+  echo "nghttp2 installation complete"
   return 0  
 }
 
@@ -410,6 +420,7 @@ check_install_smf_deps() {
   echo "Install distro libs"
   $SUDO $INSTALLER install $OPTION $PACKAGE_LIST
   ret=$?;[[ $ret -ne 0 ]] && return $ret
+  echo "distro libs installation complete"
 
   # Use fmt lib included in spdlog
   #install_fmt $1
@@ -525,6 +536,7 @@ check_install_smf_min_deps() {
   echo "Install networking tools"
   $SUDO $INSTALLER install $OPTION $PACKAGE_LIST
   ret=$?;[[ $ret -ne 0 ]] && return $ret
+  echo "networking tools installation complete"
 
   return 0
 }

ci-scripts/generateHtmlReport.py

@@ -479,8 +479,6 @@ class HtmlReport():
 				section_end_pattern = 'build_smf --clean --Verbose --build-type Release --jobs'
 				section_status = False
 				package_install = False
-				fmt_build_start = False
-				fmt_build_status = False
 				folly_build_start = False
 				folly_build_status = False
 				spdlog_build_start = False
@@ -505,34 +503,32 @@ class HtmlReport():
 							result = re.search('SMF deps installation successful', line)
 							if result is not None:
 								status = True
-							result = re.search('Install fmt from source', line)
+							result = re.search('distro libs installation complete', line)
 							if result is not None:
 								package_install = True
-								fmt_build_start = True
-							result = re.search('Installing: /usr/local/lib/pkgconfig/fmt.pc', line)
-							if result is not None:
-								fmt_build_status = True
-							result = re.search('Cloning into \'folly\'', line)
+							result = re.search('Starting to install folly', line)
 							if result is not None:
 								folly_build_start = True
-							result = re.search('Installing: /usr/local/lib/libfollybenchmark.a', line)
-							if result is not None:
+							result = re.search('folly installation complete', line)
+							if result is not None and folly_build_start:
 								folly_build_status = True
-							result = re.search('Install spdlog from', line)
+							result = re.search('Starting to install spdlog', line)
 							if result is not None:
 								spdlog_build_start = True
-							result = re.search('Install Pistache from', line)
-							if result is not None:
+							result = re.search('spdlog installation complete', line)
+							if result is not None and spdlog_build_start:
 								spdlog_build_status = True
-								pistache_build_start = True
-							result = re.search('Installing: /usr/local/lib/libpistache.a', line)
+							result = re.search('Starting to install pistache', line)
 							if result is not None:
+								pistache_build_start = True
+							result = re.search('pistache installation complete', line)
+							if result is not None and pistache_build_start:
 								pistache_build_status = True
-							result = re.search('Install Nlohmann Json', line)
-							if result is not None:
-								json_build_status = True
-							result = re.search('Installing: /usr/local/lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake', line)
+							result = re.search('Starting to install Nlohmann Json', line)
 							if result is not None:
+								json_build_start = True
+							result = re.search('Nlohmann Json installation complete', line)
+							if result is not None and json_build_start:
 								json_build_status = True
 					logfile.close()
 				if base_image:
@@ -552,23 +548,17 @@ class HtmlReport():
 				else:
 					cell_msg += '   ** Packages Installation: KO\n'
 				if base_image:
-					cell_msg += '   ** fmt Installation: N/A\n'
-				elif fmt_build_status:
-					cell_msg += '   ** fmt Installation: OK\n'
+					cell_msg += '   ** spdlog Installation: N/A\n'
+				elif spdlog_build_status:
+					cell_msg += '   ** spdlog Installation: OK\n'
 				else:
-					cell_msg += '   ** fmt Installation: KO\n'
+					cell_msg += '   ** spdlog Installation: KO\n'
 				if base_image:
 					cell_msg += '   ** folly Installation: N/A\n'
 				elif folly_build_status:
 					cell_msg += '   ** folly Installation: OK\n'
 				else:
 					cell_msg += '   ** folly Installation: KO\n'
-				if base_image:
-					cell_msg += '   ** spdlog Installation: N/A\n'
-				elif spdlog_build_status:
-					cell_msg += '   ** spdlog Installation: OK\n'
-				else:
-					cell_msg += '   ** spdlog Installation: KO\n'
 				if base_image:
 					cell_msg += '   ** pistache Installation: N/A\n'
 				elif pistache_build_status: