diff --git a/build-executor/main.sh b/build-executor/main.sh index d17a7d02738ead469f004c31674cc528989583d2..47079c904f561dab9614c312ddc057705992bfd3 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