Merge remote-tracking branch 'origin/develop' into ci-fix-reports

fb808868 · Raphael Defosseux · 01d1fabc · fb06701a · fb808868 · fb808868
Commit fb808868 authored Mar 22, 2021 by Raphael Defosseux
3 changed files
--- a/build/scripts/build_helper
+++ b/build/scripts/build_helper
@@ -39,7 +39,7 @@ case "$OS_DISTRO" in
  ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
 esac

-IS_CONTAINER=`egrep -c "docker|kubepods|podman|runc-buildah|libpod" /proc/self/cgroup`
+IS_CONTAINER=`egrep -c "docker|kubepods|podman|buildah|libpod" /proc/self/cgroup || true`

 if [ $IS_CONTAINER -eq 0 ]
 then

--- a/ci-scripts/Jenkinsfile-GitLab-Docker
+++ b/ci-scripts/Jenkinsfile-GitLab-Docker
--- a/ci-scripts/generateHtmlReport.py
+++ b/ci-scripts/generateHtmlReport.py