Merge branch 'SPI-2006' into 'master'

Mount and unmount CVMFS when needed

Closes SPI-2006

See merge request !973

jenkins/Jenkinsfunctions.groovy

@@ -70,9 +70,11 @@ def preinstallMacOS() {
   if (params.BUILDMODE == 'nightly') {
     def today = (new Date()).format("EEE")
     def yesterday = (new Date() - 1).format("EEE")
-    def prefix = '/Users/Shared/cvmfs/sft-nightlies.cern.ch/lcg/nightlies'
-    def views = '/Users/Shared/cvmfs/sft-nightlies.cern.ch/lcg/views'
+    def volume = '/Users/Shared/cvmfs/sft-nightlies.cern.ch'
+    def prefix = volume + '/lcg/nightlies'
+    def views = volume + '/lcg/views'
     sh  label:  'preinstall-macos', script: """
+      sudo umount ${volume} || true
       rm -rf ${prefix}/${LCG_VERSION}/${yesterday}
       rm -rf ${prefix}/${LCG_VERSION}/${today}
       mkdir -p ${prefix}/${LCG_VERSION}/${today}
@@ -88,10 +90,12 @@ def preinstallMacOS() {
     """
   }
   else if (params.BUILDMODE == 'release') {
-    def prefix = '/Users/Shared/cvmfs/sft.cern.ch/lcg/releases'
-    def views = '/Users/Shared/cvmfs/sft.cern.ch/lcg/views'
+    def volume = '/Users/Shared/cvmfs/sft.cern.ch'
+    def prefix = volume + '/lcg/releases'
+    def views = volume + '/lcg/views'
     sh  label:  'preinstall-macos', script: """
       unset RELEASE_MODE
+      sudo umount ${volume} || true
       mkdir -p ${prefix}/LCG_${LCG_VERSION}
       rm -rf ${prefix}/LCG_${LCG_VERSION}/*
       mkdir -p ${views}/LCG_${LCG_VERSION}

jenkins/wait_for_cvmfs.sh

@@ -9,6 +9,12 @@ for iterations in {1..12}
 do
     if [ `uname -s` == Darwin ]; then
         current_rev=`xattr -p user.revision /cvmfs/$VOLUME`
+        if [ $? -ne 0 ]; then
+            # Probably the CVMFS volume is not mounted. Try to mount it...
+            echo "Mounting CVMFS volume $VOLUME"
+            sudo mount -t cvmfs $VOLUME  /Users/Shared/cvmfs/$VOLUME
+            current_rev=`xattr -p user.revision /cvmfs/$VOLUME`
+        fi
     else
         current_rev=`attr -qg revision /cvmfs/$VOLUME/`
     fi