Source the OSG grid environment prior to invoking voms-proxy-*

SiteTests/testjob/tests/CE-cms-xrootd-access

@@ -54,16 +54,16 @@ fi
 # workaround to suppress voms errors on OSG
 export VOMS_PROXY_INFO_DONT_VERIFY_AC="1"
 
-dn=`voms-proxy-info --identity`
-fqan=`voms-proxy-info --fqan | head -1`
-add2buffer "DN: $dn"
-add2buffer "Primary FQAN: $fqan"
-
 # Setup the grid environment:
 if [ -n "$OSG_GRID" ] ; then
     [ -f $OSG_GRID/setup.sh ] && source $OSG_GRID/setup.sh
 fi
 
+dn=`voms-proxy-info --identity`
+fqan=`voms-proxy-info --fqan | head -1`
+add2buffer "DN: $dn"
+add2buffer "Primary FQAN: $fqan"
+
 # Set the CMS environment
 if [ -n "$VO_CMS_SW_DIR" ]; then
     SW_DIR=$VO_CMS_SW_DIR

SiteTests/testjob/tests/CE-cms-xrootd-fallback

@@ -54,16 +54,16 @@ fi
 # workaround to suppress voms errors on OSG
 export VOMS_PROXY_INFO_DONT_VERIFY_AC="1"
 
-dn=`voms-proxy-info --identity`
-fqan=`voms-proxy-info --fqan | head -1`
-add2buffer "DN: $dn"
-add2buffer "Primary FQAN: $fqan"
-
 # Setup the grid environment:
 if [ -n "$OSG_GRID" ] ; then
     [ -f $OSG_GRID/setup.sh ] && source $OSG_GRID/setup.sh
 fi
 
+dn=`voms-proxy-info --identity`
+fqan=`voms-proxy-info --fqan | head -1`
+add2buffer "DN: $dn"
+add2buffer "Primary FQAN: $fqan"
+
 # Set the CMS environment
 if [ -n "$VO_CMS_SW_DIR" ]; then
     SW_DIR=$VO_CMS_SW_DIR