Merge branch 'fix-rhel8-image-build' into 'develop'

Fix rhel8 image build

See merge request oai/cn5g/oai-cn5g-smf!56

build/scripts/build_helper.fb_folly

@@ -49,6 +49,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 \

build/scripts/build_helper.smf

@@ -242,6 +242,8 @@ install_nghttp2_from_git() {
       binutils-devel \
       autoconf \
       automake \
+      $CMAKE \
+      make \
       libtool \
       pkg-config \
       zlib-devel \

ci-scripts/generateHtmlReport.py

@@ -774,7 +774,10 @@ class HtmlReport():
 			logFileName = 'smf_' + variant + '_image_build.log'
 			if os.path.isfile(cwd + '/archives/' + logFileName):
 				section_start_pattern = 'WORKDIR /openair-smf/etc'
-				section_end_pattern = 'Successfully tagged oai-smf'
+				if variant == 'docker':
+					section_end_pattern = 'Successfully tagged oai-smf'
+				else:
+					section_end_pattern = 'COMMIT oai-smf:'
 				section_status = False
 				status = False
 				with open(cwd + '/archives/' + logFileName, 'r') as logfile:
@@ -845,7 +848,10 @@ class HtmlReport():
 								else:
 									result = re.search('oai-smf *develop', line)
 							if result is not None:
-								result = re.search('ago *([0-9A-Z]+)', line)
+								if variant == 'docker':
+									result = re.search('ago *([0-9A-Z]+)', line)
+								else:
+									result = re.search('ago *([0-9]+ [A-Z]+)', line)
 								if result is not None:
 									size = result.group(1)
 									status = True