Using new OSG SW discovery

SiteTests/testjob/tests/CE-cms-analysis

@@ -22,9 +22,26 @@ echo "<h2><a name=\"AnalysisTest\"></a>Analysis Test</h2>"
 
 # Source the CMS environment
 echo "<h3>Sourcing the CMS environment</h3>"
-if [ -n "$OSG_APP" ] ; then
+if [ -n "$OSG_GRID" ] ; then
+    [ -f $OSG_GRID/setup.sh ] && source $OSG_GRID/setup.sh
+    echo "<p>OSG Middleware</p>"
+    if [ -d $OSG_APP/cmssoft/cms ] ;then
          SW_DIR=$OSG_APP/cmssoft/cms
+         echo "<p>Checking variable: \$OSG_APP/cmssoft/cms=$OSG_APP/cmssoft/cms</p>"
+    elif [ -d $CVMFS/cms.cern.ch ] ; then
+         SW_DIR=$CVMFS/cms.cern.ch
+         echo "<p>Checking variable: \$CVMFS/cms.cern.ch=$CVMFS/cms.cern.ch</p>"
+    elif [ -d /cvmfs/cms.cern.ch ] ; then
+         SW_DIR=/cvmfs/cms.cern.ch
+         echo "<p>Checking fallback location: /cvmfs/cms.cern.ch</p>"
+    else
+         echo "<p>"
+         echo "Cannot find CMS software area."
+         echo "</p>"
+         exit $SAME_ERROR
+    fi
 elif [ -n "$VO_CMS_SW_DIR" ] ; then
+    echo "<p>gLite Middleware</p>"
     SW_DIR=$VO_CMS_SW_DIR
 else
     echo "<p>ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined</p>"

SiteTests/testjob/tests/CE-cms-basic

@@ -19,16 +19,27 @@ cp $SAME_SENSOR_HOME/tests/CMS-SAM-Banner.html .
 echo "</pre>"
 
 echo "<h2>Checking software directory</h2>"
-echo "<pre>"
-if [ -n "$OSG_APP" ] ; then
-    SW_DIR=$OSG_APP/cmssoft/cms
+if [ -n "$OSG_GRID" ] ; then
     [ -f $OSG_GRID/setup.sh ] && source $OSG_GRID/setup.sh
-    echo "OSG_APP/cmssoft/cms=$OSG_APP/cmssoft/cms"
+    echo "<p>OSG Middleware</p>"
+    if [ -d $OSG_APP/cmssoft/cms ] ;then
+         SW_DIR=$OSG_APP/cmssoft/cms
+         echo "<p>Checking variable: \$OSG_APP/cmssoft/cms=$OSG_APP/cmssoft/cms</p>"
+    elif [ -d $CVMFS/cms.cern.ch ] ; then
+         SW_DIR=$CVMFS/cms.cern.ch
+         echo "<p>Checking variable: \$CVMFS/cms.cern.ch=$CVMFS/cms.cern.ch</p>"
+    elif [ -d /cvmfs/cms.cern.ch ] ; then
+         SW_DIR=/cvmfs/cms.cern.ch
+         echo "<p>Checking fallback location: /cvmfs/cms.cern.ch</p>"
+    else
+         echo "<p>Cannot find CMS software area.</p>"
+         exit $SAME_ERROR
+    fi
 elif [ -n "$VO_CMS_SW_DIR" ] ; then
+    echo "<p>gLite Middleware</p>"
     SW_DIR=$VO_CMS_SW_DIR
-    echo "VO_CMS_SW_DIR=$VO_CMS_SW_DIR"
+    echo "<p>VO_CMS_SW_DIR=$VO_CMS_SW_DIR</p>"
 else
-    echo "</pre>"
     echo "<p>"
     echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined"
     echo "<br />"