Commit b0fd4700 authored by Raphael Defosseux's avatar Raphael Defosseux

fix(ci): fixing HTML reporting on the case of Merge-Request Build

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 44a5b815
...@@ -274,6 +274,9 @@ class HtmlReport(): ...@@ -274,6 +274,9 @@ class HtmlReport():
if os.path.isfile(cwd + '/archives/' + logFileName): if os.path.isfile(cwd + '/archives/' + logFileName):
status = False status = False
section_start_pattern = 'RUN git clone -b stable/2101 https://github.com/fdio/vpp.git' section_start_pattern = 'RUN git clone -b stable/2101 https://github.com/fdio/vpp.git'
if self.git_pull_request:
section_end_pattern = 'RUN make build-release -C vpp'
else:
section_end_pattern = 'RUN make install-dep -C vpp' section_end_pattern = 'RUN make install-dep -C vpp'
section_status = False section_status = False
with open(cwd + '/archives/' + logFileName, 'r') as logfile: with open(cwd + '/archives/' + logFileName, 'r') as logfile:
...@@ -322,6 +325,9 @@ class HtmlReport(): ...@@ -322,6 +325,9 @@ class HtmlReport():
logFileName = 'upf_' + variant + '_image_build.log' logFileName = 'upf_' + variant + '_image_build.log'
if os.path.isfile(cwd + '/archives/' + logFileName): if os.path.isfile(cwd + '/archives/' + logFileName):
status = False status = False
if self.git_pull_request:
section_start_pattern = 'RUN make build-release -C vpp'
else:
section_start_pattern = 'RUN make install-dep -C vpp' section_start_pattern = 'RUN make install-dep -C vpp'
if variant == 'docker': if variant == 'docker':
section_end_pattern = 'FROM ubuntu:bionic as oai-upf-vpp' section_end_pattern = 'FROM ubuntu:bionic as oai-upf-vpp'
...@@ -355,6 +361,7 @@ class HtmlReport(): ...@@ -355,6 +361,7 @@ class HtmlReport():
else: else:
cell_msg = ' <td bgcolor="Tomato"><pre style="border:none; background-color:Tomato"><b>' cell_msg = ' <td bgcolor="Tomato"><pre style="border:none; background-color:Tomato"><b>'
cell_msg += 'KO:\n' cell_msg += 'KO:\n'
if not self.git_pull_request:
cell_msg += ' -- make install-dep -C vpp\n' cell_msg += ' -- make install-dep -C vpp\n'
if package_install: if package_install:
cell_msg += ' ** Packages Installation: OK\n' cell_msg += ' ** Packages Installation: OK\n'
......
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