CI: added good build markers

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

build/scripts/build_helper.amf

@@ -36,6 +36,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_cpprestsdk_from_git() {
+  echo "Starting to install cpprestsdk"
   if [ $1 -eq 0 ]; then
     read -p "Do you want to install C++ REST SDK ? <y/N> " prompt
     OPTION="-y"
@@ -73,6 +74,7 @@ install_cpprestsdk_from_git() {
     $SUDO ldconfig -v
     popd
   fi
+  echo "cpprestsdk installation complete"
   return 0
 }
 
@@ -80,6 +82,7 @@ install_cpprestsdk_from_git() {
 #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=""
@@ -108,6 +111,7 @@ install_fmt() {
     cd /tmp
     rm -rf /tmp/fmt*
   fi
+  echo "fmt installation complete"
   return 0
 }
 
@@ -115,6 +119,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=""
@@ -147,6 +152,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
 }
 
@@ -154,6 +160,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"
@@ -196,6 +203,7 @@ install_pistache_from_git() {
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     popd
   fi
+  echo "pistache installation complete"
   return 0
 }
 
@@ -203,6 +211,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=""
@@ -241,6 +250,7 @@ install_nlohmann_from_git() {
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     popd
   fi
+  echo "Nlohmann Json installation complete"
   return 0
 }
 
@@ -380,6 +390,7 @@ check_install_amf_deps(){
   echo "Install distro libs"
   $SUDO $INSTALLER install $OPTION $PACKAGE_LIST
   ret=$?;[[ $ret -ne 0 ]] && return $ret
+  echo "distro libs installation complete"
 
   install_cpprestsdk_from_git $1 $2
   ret=$?;[[ $ret -ne 0 ]] && return $ret

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
@@ -49,7 +50,9 @@ install_fb_folly_from_source(){
   then
     if [[ "$OS_BASEDISTRO" == "fedora" ]]; then 
       $SUDO $INSTALLER install $OPTION \
+        gcc-c++ \
         $CMAKE \
+        make \
         boost-devel \
         libevent-devel \
         double-conversion-devel \
@@ -136,6 +139,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
 }

ci-scripts/generateHtmlReport.py

@@ -471,6 +471,8 @@ class HtmlReport():
 				pistache_build_status = False
 				json_build_start = False
 				json_build_status = False
+				cpprest_build_start = False
+				cpprest_build_status = False
 				base_image = False
 				with open(cwd + '/archives/' + logFileName, 'r') as logfile:
 					for line in logfile:
@@ -487,33 +489,43 @@ class HtmlReport():
 							result = re.search('AMF 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)
+							result = re.search('Starting to install cpprestsdk', line)
 							if result is not None:
+								cpprest_build_start = True
+							result = re.search('cpprestsdk installation complete', line)
+							if result is not None and cpprest_build_start:
 								fmt_build_status = True
-							result = re.search('Cloning into \'folly\'', line)
+							result = re.search('Starting to install fmt', line)
 							if result is not None:
-								folly_build_start = True
-							result = re.search('Installing: /usr/local/lib/libfollybenchmark.a', line)
+								fmt_build_start = True
+							result = re.search('fmt installation complete', line)
+							if result is not None and fmt_build_start:
+								fmt_build_status = True
+							result = re.search('Starting to install folly', line)
 							if result is not None:
+								folly_build_start = True
+							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)
+							result = re.search('Starting to 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('Nlohmann Json installation complete', line)
 							if result is not None:
 								json_build_status = True
 					logfile.close()
@@ -533,6 +545,12 @@ class HtmlReport():
 					cell_msg += '   ** Packages Installation: OK\n'
 				else:
 					cell_msg += '   ** Packages Installation: KO\n'
+				if base_image:
+					cell_msg += '   ** cpprestsdk Installation: N/A\n'
+				elif cpprest_build_status:
+					cell_msg += '   ** cpprestsdk Installation: OK\n'
+				else:
+					cell_msg += '   ** cpprestsdk Installation: KO\n'
 				if base_image:
 					cell_msg += '   ** fmt Installation: N/A\n'
 				elif fmt_build_status: