merge qa-build-igwn-pe commit 00e4d1de from 3363073

common/Dockerfile.template

@@ -35,8 +35,9 @@ RUN useradd -u 1001 -r -g 0 -d /bmk -s /sbin/nologin -c "Default Application Use
 COPY __insert_bmkdir__ /bmk/__insert_bmkdir__
 COPY common/bmk-driver.sh common/parser-driver.sh /bmk/__insert_bmkdir__/ 
 
-
-RUN if [ ! -d /bmk/__insert_bmkdir__/data ]; then mkdir /bmk/__insert_bmkdir__/data; fi; \
+RUN if [ -d /bmk/__insert_bmkdir__/jobs ]; then rm -rf /bmk/__insert_bmkdir__/jobs; fi; \
+    if [ -e /bmk/__insert_bmkdir__/test_parser.sh ]; then rm -rf /bmk/__insert_bmkdir__/test_parser.sh; fi; \ 
+    if [ ! -d /bmk/__insert_bmkdir__/data ]; then mkdir /bmk/__insert_bmkdir__/data; fi; \
     for file in $(cd /bmk/data; ls); do ln -sf /bmk/data/$file /bmk/__insert_bmkdir__/data/$file; done; \
     tar -cf /tmp/bmk_checksum.tar /bmk && md5sum /tmp/bmk_checksum.tar | cut -f1 -d" " > /tmp/bmk_checksum && rm /tmp/bmk_checksum.tar; \
     cvmfs_checksum=`cat /tmp/cvmfs_checksum` && bmkdata_checksum=`cat /tmp/bmkdata_checksum` && bmk_checksum=`cat /tmp/bmk_checksum` && rm /tmp/cvmfs_checksum /tmp/bmkdata_checksum /tmp/bmk_checksum && echo '{"version":"__insert_bmktag__","description":"__insert_bmkdescription__","cvmfs_checksum":"'$cvmfs_checksum'","bmkdata_checksum":"'$bmkdata_checksum'","bmk_checksum":"'$bmk_checksum'"}' > /bmk/__insert_bmkdir__/version.json