From ae2444e955fb6cc335c891b51fca162343917abe Mon Sep 17 00:00:00 2001
From: Andrea Valassi <andrea.valassi@cern.ch>
Date: Sun, 14 Jul 2019 09:12:39 +0200
Subject: [PATCH] Attempt a fix for SITECONF/local in CMS (BMK-15), keep it
 empty

---
 build-executor/main.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build-executor/main.sh b/build-executor/main.sh
index d17a7d02..47079c90 100755
--- a/build-executor/main.sh
+++ b/build-executor/main.sh
@@ -267,9 +267,14 @@ function copy_cvmfs(){
   echo "[copy_cvmfs] mv ${MAIN_CVMFSEXPORTDIR}/cvmfs $MAIN_HEPWLBUILDDIR "
   mv ${MAIN_CVMFSEXPORTDIR}/cvmfs $MAIN_HEPWLBUILDDIR || fail "[copy_cvmfs] cannot mv ${MAIN_CVMFSEXPORTDIR}/cvmfs $MAIN_HEPWLBUILDDIR"
   # FIXME: if cms repo, need to copy by hand the SITECONF/local, because it's a sym link
-  if [ -e /cvmfs/cms.cern.ch/SITECONF/local ]; then
-    cp -r -H /cvmfs/cms.cern.ch/SITECONF/local $MAIN_HEPWLBUILDDIR/cvmfs/cms.cern.ch/SITECONF/ || fail "[copy_cvmfs] cannot cp /cvmfs/cms.cern.ch/SITECONF/local" # BMK-15: do NOT use '.. && ( .. || fail )'
+  #if [ -e /cvmfs/cms.cern.ch/SITECONF/local ]; then
+  #  cp -r -H /cvmfs/cms.cern.ch/SITECONF/local $MAIN_HEPWLBUILDDIR/cvmfs/cms.cern.ch/SITECONF/ || fail "[copy_cvmfs] cannot cp /cvmfs/cms.cern.ch/SITECONF/local" # BMK-15: do NOT use '.. && ( .. || fail )'
+  #fi
+  # FIXME: try to run CMS bmks without SITECONF/local (BMK-15)
+  if [ -e $MAIN_HEPWLBUILDDIR/cvmfs/cms.cern.ch/SITECONF/local ]; then
+    rm -rf $MAIN_HEPWLBUILDDIR/cvmfs/cms.cern.ch/SITECONF/local
   fi
+  mkdir -p $MAIN_HEPWLBUILDDIR/cvmfs/cms.cern.ch/SITECONF/local/JobConfig # empty
   ls $MAIN_HEPWLBUILDDIR/cvmfs
   echo "[copy_cvmfs] finished at $(date)"
   return 0
-- 
GitLab