Commit dd70400d authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Using new OSG SW discovery

parent 78584d97
...@@ -22,9 +22,26 @@ echo "<h2><a name=\"AnalysisTest\"></a>Analysis Test</h2>" ...@@ -22,9 +22,26 @@ echo "<h2><a name=\"AnalysisTest\"></a>Analysis Test</h2>"
# Source the CMS environment # Source the CMS environment
echo "<h3>Sourcing the CMS environment</h3>" echo "<h3>Sourcing the CMS environment</h3>"
if [ -n "$OSG_APP" ] ; then if [ -n "$OSG_GRID" ] ; then
SW_DIR=$OSG_APP/cmssoft/cms [ -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 elif [ -n "$VO_CMS_SW_DIR" ] ; then
echo "<p>gLite Middleware</p>"
SW_DIR=$VO_CMS_SW_DIR SW_DIR=$VO_CMS_SW_DIR
else else
echo "<p>ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined</p>" echo "<p>ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined</p>"
......
...@@ -19,16 +19,27 @@ cp $SAME_SENSOR_HOME/tests/CMS-SAM-Banner.html . ...@@ -19,16 +19,27 @@ cp $SAME_SENSOR_HOME/tests/CMS-SAM-Banner.html .
echo "</pre>" echo "</pre>"
echo "<h2>Checking software directory</h2>" echo "<h2>Checking software directory</h2>"
echo "<pre>" if [ -n "$OSG_GRID" ] ; then
if [ -n "$OSG_APP" ] ; then
SW_DIR=$OSG_APP/cmssoft/cms
[ -f $OSG_GRID/setup.sh ] && source $OSG_GRID/setup.sh [ -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 elif [ -n "$VO_CMS_SW_DIR" ] ; then
echo "<p>gLite Middleware</p>"
SW_DIR=$VO_CMS_SW_DIR 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 else
echo "</pre>"
echo "<p>" echo "<p>"
echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined" echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined"
echo "<br />" echo "<br />"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment