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

CI: fix in the build reporting


Signed-off-by: Raphael Defosseux's avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 7f597d49
Pipeline #23047 passed with stage
in 0 seconds
archives
*.html
......@@ -136,7 +136,7 @@ pipeline {
echo "Maybe a previous build went wrong"
}
}
myShCmd('docker build --target oai-nrf --tag oai-nrf:' + nrf_tag + ' --file docker/Dockerfile.ubuntu.18.04 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/nrf_docker_image_build.log 2>&1', new_host_flag, new_host_user, new_host)
myShCmd('docker build --no-cache --target oai-nrf --tag oai-nrf:' + nrf_tag + ' --file docker/Dockerfile.ubuntu.18.04 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/nrf_docker_image_build.log 2>&1', new_host_flag, new_host_user, new_host)
myShCmd('docker image ls >> archives/nrf_docker_image_build.log', new_host_flag, new_host_user, new_host)
}
}
......
......@@ -684,7 +684,7 @@ class HtmlReport():
cwd = os.getcwd()
if os.path.isfile(cwd + '/archives/' + logFileName):
section_start_pattern = 'FROM ubuntu:bionic as oai-nrf$'
section_end_pattern = 'WORKDIR /openair-nrf/etc'
section_end_pattern = 'COPY --from=oai-nrf-builder /openair-nrf/docker/entrypoint.sh entrypoint.sh'
section_status = False
status = False
with open(cwd + '/archives/' + logFileName, 'r') as logfile:
......
......@@ -67,6 +67,7 @@ COPY --from=oai-nrf-builder /openair-nrf/docker/entrypoint.sh entrypoint.sh
RUN ldconfig
# Copying template configuration files
WORKDIR /openair-nrf/etc
COPY --from=oai-nrf-builder /openair-nrf/etc/nrf.conf /openair-nrf/etc/
WORKDIR /openair-nrf
......@@ -78,4 +79,4 @@ RUN chmod +x /openair-nrf/bin/entrypoint.sh
CMD ["/openair-nrf/bin/oai_nrf", "-c", "/openair-nrf/etc/nrf.conf", "-o"]
ENTRYPOINT ["/bin/bash","/openair-nrf/bin/entrypoint.sh"]
\ No newline at end of file
ENTRYPOINT ["/bin/bash","/openair-nrf/bin/entrypoint.sh"]
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