New OSG sw discovery

SiteTests/testjob/tests/CE-cms-env

@@ -46,16 +46,26 @@ echo
 
 # Software area definition and existence
 isEGEE=0
-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
+    if [ -d $OSG_APP/cmssoft/cms ] ;then
+        SW_DIR=$OSG_APP/cmssoft/cms
+    elif [ -d $CVMFS/cms.cern.ch ] ; then
+        SW_DIR=$CVMFS/cms.cern.ch
+    elif [ -d /cvmfs/cms.cern.ch ] ; then
+        SW_DIR=/cvmfs/cms.cern.ch
+    else
+        echo "ERROR: Cannot find CMS software in OSG node"
+	echo "summary: SW_DIR_UNDEF"
+        exit $SAME_ERROR
+    fi
     echo "SwArea: $SW_DIR"
 elif [ -n "$VO_CMS_SW_DIR" ] ; then
     isEGEE=1
     SW_DIR=$VO_CMS_SW_DIR
     echo "SwArea: $SW_DIR"
 else
-    echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined"
+    echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_GRID defined"
     echo "summary: SW_DIR_UNDEF"
     exit $SAME_ERROR
 fi