Commit a9ed89a3 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

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

Fix rhel8 image build

See merge request !56
parents 84a148a0 7ae003ec
...@@ -49,6 +49,9 @@ install_fb_folly_from_source(){ ...@@ -49,6 +49,9 @@ install_fb_folly_from_source(){
then then
if [[ "$OS_BASEDISTRO" == "fedora" ]]; then if [[ "$OS_BASEDISTRO" == "fedora" ]]; then
$SUDO $INSTALLER install $OPTION \ $SUDO $INSTALLER install $OPTION \
gcc-c++ \
$CMAKE \
make \
boost-devel \ boost-devel \
libevent-devel \ libevent-devel \
double-conversion-devel \ double-conversion-devel \
......
...@@ -242,6 +242,8 @@ install_nghttp2_from_git() { ...@@ -242,6 +242,8 @@ install_nghttp2_from_git() {
binutils-devel \ binutils-devel \
autoconf \ autoconf \
automake \ automake \
$CMAKE \
make \
libtool \ libtool \
pkg-config \ pkg-config \
zlib-devel \ zlib-devel \
......
...@@ -774,7 +774,10 @@ class HtmlReport(): ...@@ -774,7 +774,10 @@ class HtmlReport():
logFileName = 'smf_' + variant + '_image_build.log' logFileName = 'smf_' + variant + '_image_build.log'
if os.path.isfile(cwd + '/archives/' + logFileName): if os.path.isfile(cwd + '/archives/' + logFileName):
section_start_pattern = 'WORKDIR /openair-smf/etc' 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 section_status = False
status = False status = False
with open(cwd + '/archives/' + logFileName, 'r') as logfile: with open(cwd + '/archives/' + logFileName, 'r') as logfile:
...@@ -845,7 +848,10 @@ class HtmlReport(): ...@@ -845,7 +848,10 @@ class HtmlReport():
else: else:
result = re.search('oai-smf *develop', line) result = re.search('oai-smf *develop', line)
if result is not None: 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: if result is not None:
size = result.group(1) size = result.group(1)
status = True status = True
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment