fix for BrokerInfo for CREAM and add diagnostics

SiteTests/testjob/tests/CE-cms-swinst

@@ -20,14 +20,15 @@ date
 date --utc
 voms-proxy-info -identity -fqan
 id
+
 workdir=`mktemp -d workdirXXXXXX`
 cd $workdir
 cp -v $SAME_SENSOR_HOME/tests/cmssw_required_version_list.txt .
 cp -v $SAME_SENSOR_HOME/tests/fetch-from-web .
+cp -v $SAME_SENSOR_HOME/.BrokerInfo .
 
 [ -n "$GLITE_WMS_RB_BROKERINFO" ] && cp -v $GLITE_WMS_RB_BROKERINFO .
 [ -n "$EDG_WL_RB_BROKERINFO" ] &&  cp -v $EDG_WL_RB_BROKERINFO .
-cp -v ../.BrokerInfo .
 
 echo "</pre>"
 
@@ -253,8 +254,6 @@ do
   fi
 done
 
-
-
 echo "<h2>Verify installed vs. published CMSSW versions</h2>"
 
 # check that installed version list matches published tags
@@ -265,6 +264,8 @@ missing_version_tag=0
 missing_published_version=0
 missing_production_release=0
 
+echo "<p>Try various methods to find CE host name<p>"
+
 if [ $isEGEE == 1 ]
 then
   CE=`glite-brokerinfo getCE`
@@ -273,9 +274,21 @@ if [ $isOSG == 1 ]
 then
   CE=`grep 'name.*jobmanager' .BrokerInfo|cut -d'"' -f2`
 fi
+echo "BrokerInfo reported   : " $CE "<br>"
+echo "possible env.variables<br>"
+echo "GLITE_WMS_LOG_DESTINATION=" $GLITE_WMS_LOG_DESTINATION "<br>"
+echo "GLOBUS_CE=              " $GLOBUS_CE "<br>"
+BIH=`ls -l $SAME_SENSOR_HOME/.BrokerInfo 2>&1`
+echo "BrokerInfo file in SAME_SENSOR_HOME=" $BIH "<br>"
+
 if [ -z "$CE" ] ; then
-  CE=$GLOBUS_CE
+    [ -n $GLITE_WMS_LOG_DESTINATION ] && CE=$GLITE_WMS_LOG_DESTINATION
 fi
+
+if [ -z "$CE" ] ; then
+    [ -n $GLOBUS_CE ] && CE=$GLOBUS_CE
+fi
+
 if [ -z "$CE" ] ; then
   echo "<p>WARNING: Cannot derive CE name. After attempting: <br>"
   echo "<pre>"
@@ -283,6 +296,7 @@ if [ -z "$CE" ] ; then
   glite-brokerinfo getCE
   grep 'name.*jobmanager' .BrokerInfo|cut -d'"' -f2
   echo $GLOBUS_CE
+  echo $GLITE_WMS_LOG_DESTINATION
   set +x
   echo "</pre>"
   exit $SAME_WARNING