moved valgrind suppressions out of the docker images and use them from the...

moved valgrind suppressions out of the docker images and use them from the msk_jenkins home directory

dockerfiles/archlinux.docker

@@ -36,6 +36,5 @@ RUN pacman -S --noconfirm wget &&\
 
 # copy in lcov_cobertura
 ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
-ADD valgrind.suppressions /common/valgrind.suppressions
 # add msk_jenkins user
 RUN useradd -u 30996 msk_jenkins

dockerfiles/bionic.docker

@@ -35,7 +35,6 @@ RUN apt-get update && \
 # NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
    
 ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
-ADD valgrind.suppressions /common/valgrind.suppressions
 
 # Start rpcbind at launch of the container, required for DOOCS
 ENTRYPOINT ["bash", "-c", "rpcbind -f -w ; bash"]

dockerfiles/tumbleweed.docker

@@ -25,7 +25,6 @@ RUN zypper refresh && \
 # NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
 
 ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
-ADD valgrind.suppressions /common/valgrind.suppressions
 ADD tumbleweed_proxy /etc/sysconfig/proxy
 
 # Start rpcbind at launch of the container, required for DOOCS

dockerfiles/valgrind.suppressions/DOOCS.supp

-{
-   ServerAddress
-   Memcheck:Leak
-   fun:_Znwm
-   fun:_ZNSs4_Rep9_S_createEmmRKSaIcE
-   ...
-   fun:_ZN5D_fct9constructEPKc
-   fun:_ZN5D_fctC1EPKcP5EqFct
-   fun:_ZN8D_stringC1EPKcP5EqFct
-   fun:D_svraddr
-   fun:_ZN5EqFctC1EPKcPSs
-   ...
-}

dockerfiles/xenial.docker

@@ -36,7 +36,6 @@ RUN apt-get update && \
 # NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
 
 ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
-ADD valgrind.suppressions /common/valgrind.suppressions
 
 # Start rpcbind at launch of the container, required for DOOCS
 ENTRYPOINT ["bash", "-c", "rpcbind -f -w ; bash"]

vars/helper.groovy

@@ -231,6 +231,8 @@ def doValgrind(String label, String buildType) {
     chown msk_jenkins -R /scratch
     cd /scratch/build-${parentJob}
     
+    cat /home/msk_jenkins/JenkinsConfiguration/valgrind.suppressions/common.supp /home/msk_jenkins/JenkinsConfiguration/valgrind.suppressions/${label}.supp > /scratch/valgrind.supp
+    
     EXECLIST=""
     for testlist in `find -name CTestTestfile.cmake` ; do
       dir=`dirname "\${testlist}"`
@@ -248,8 +250,10 @@ def doValgrind(String label, String buildType) {
       for test in \${EXECLIST} ; do
         testname=`basename \${test}`
         if [ -z "`echo " \${valgrindExcludes} " | grep " \${testname} "`" ]; then
-          sudo -u msk_jenkins valgrind --num-callers=99 --gen-suppressions=all --suppressions=/common/valgrind.suppressions/ChimeraTK.supp --tool=memcheck --leak-check=full --undef-value-errors=yes --xml=yes --xml-file=/scratch/build-${parentJob}/valgrind.\${testname}.memcheck.valgrind \${test}
-          # sudo -u msk_jenkins valgrind --num-callers=99 --gen-suppressions=all --suppressions=/common/valgrind.suppressions/ChimeraTK.sup --tool=helgrind --xml=yes --xml-file=/scratch/build-${parentJob}/valgrind.\${testname}.helgrind.valgrind \${test}
+          sudo -u msk_jenkins valgrind --num-callers=99 --gen-suppressions=all --suppressions=/scratch/valgrind.supp   \
+                                       --tool=memcheck --leak-check=full --undef-value-errors=yes --xml=yes            \
+                                       --xml-file=/scratch/build-${parentJob}/valgrind.\${testname}.memcheck.valgrind  \
+                                       \${test}
         fi
       done
       cd /scratch/build-${parentJob}