use new sample for CMSSW 353/SL5

SiteTests/testjob/tests/AnalysisTest.sh

@@ -3,11 +3,9 @@
 #
 # Choose CMSSW version
 #
-cmsswvsn=CMSSW_2_2_11
-if [ "X$1" != "X" ]
-then
-   cmsswvsn=$1
-fi
+
+cmsswvsn=CMSSW_3_5_3
+
 #
 # Print CMS_PATH
 #
@@ -15,7 +13,7 @@ printf "CMS_PATH $CMS_PATH\n"
 #
 # Check that scramv1 command was defined by . $CMS_PATH/cmsset_default.sh
 #
-type scramv1 > /dev/null 2>&1
+which scramv1 > /dev/null 2>&1
 sset=$?
 if [ $sset -ne 0 ]
 then 
@@ -38,7 +36,10 @@ if [ $scms -ne 0 ]
 then
    cat $tmpfile
    printf "AnalysisTest.sh: Error. $cmsswvsn not available\n"
-   exit $SAME_ERROR
+#
+# temporarely end with WARNING, not ERROR to allow for SL4 CE's
+   #exit $SAME_ERROR
+   exit $SAME_WARNING
 fi
 tail -5 $tmpfile
 printf "scramv1 project CMSSW $cmsswvsn ... completed\n"
@@ -56,16 +57,16 @@ cd $current
 # There are all files available in SAM dataset, which is at all sites
 #
 /bin/cat > possible-input-files <<EOI
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/18A1B60B-A5A5-DD11-84FC-00163E1124E2.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/2C556CAE-ACA5-DD11-A6C7-00163E11248E.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/5A50C03F-ADA5-DD11-9FE8-00163E11247A.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/5E326586-A4A5-DD11-A6AA-0015600E3ECA.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/806CD613-AEA5-DD11-8795-00163E112499.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/8C1E14E9-AFA5-DD11-ACFE-00163E1124AF.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/94AD82A3-AEA5-DD11-9E95-00163E11247A.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/A82F9385-A3A5-DD11-B03E-00163E1124E9.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/BCC46CCA-A4A5-DD11-9CB5-001560AC1D24.root
-/store/mc/SAM/QCD_pt_0_15/GEN-SIM-RAW-RECO/IDEAL_V9_SAM/0000/F21EB2B6-ABA5-DD11-87D5-00163E11247C.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/E62F2838-D52D-DF11-9A5D-0030487CAF0E.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/E259C637-D52D-DF11-B427-00304879FA4C.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/C4877AC8-D52D-DF11-B3C3-0030487CD840.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/767081E1-D42D-DF11-961C-0030487CAEAC.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/66138D6A-D52D-DF11-82FE-0030487CD840.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/347851BF-D92D-DF11-AAA6-0030487CD6E6.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/1A6F9FCA-D52D-DF11-A910-0030487CD906.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/10BC2C4C-D42D-DF11-8A7D-0030487CD7B4.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/108EAF51-D42D-DF11-B69F-0030487CAEAC.root
+/store/mc/SAM/RelValProdTTbar/GEN-SIM-DIGI-RECO/MC_3XY_V24_SAM-v1/0001/0CACD9CA-D52D-DF11-B274-0030487CAF5E.root
 EOI
 #
 nFiles=`cat possible-input-files | wc -l`
@@ -104,7 +105,7 @@ process.source = cms.Source("PoolSource",
 
 process.out = cms.OutputModule("PoolOutputModule",
      fileName = cms.untracked.string('myout.root'),
-     fastCloning = cms.untracked.bool(False),
+#     fastCloning = cms.untracked.bool(False),
      outputCommands = cms.untracked.vstring('drop *')
 )
 process.e = cms.EndPath(process.out)

SiteTests/testjob/tests/CE-cms-analysis

@@ -4,8 +4,6 @@ shopt -s expand_aliases
 err=0
 warn=0
 
-cmsswvsn=CMSSW_2_2_13
-
 cat $SAME_SENSOR_HOME/tests/CMS-SAM-Banner.html
 
 echo "<pre>"
@@ -22,8 +20,8 @@ set +x
 echo "<h2><a name="Analysis Test"></a>Analysis Test</h2>"
 # Source the CMS environment
 echo "<h3>Sourcing the CMS environment</h3>"
-export SCRAM_ARCH=slc4_ia32_gcc345
-export BUILD_ARCH=slc4_ia32_gcc345
+export SCRAM_ARCH=slc5_ia32_gcc434
+export BUILD_ARCH=$SCRAM_ARCH
 if [ -n "$OSG_APP" ] ; then
     SW_DIR=$OSG_APP/cmssoft/cms
 elif [ -n "$VO_CMS_SW_DIR" ] ; then
@@ -56,12 +54,12 @@ fi
 echo "<h3>Test analysis of data from /store/data </h3>"
 echo "<pre>"
 echo " SAME_SENSOR_HOME: " $SAME_SENSOR_HOME
-echo "Running $SAME_SENSOR_HOME/tests/AnalysisTest.sh $cmsswvsn 2>&1"
+echo "Running $SAME_SENSOR_HOME/tests/AnalysisTest.sh 2>&1"
 AnalysisTestWorkDir=`mktemp -d AnalysisTestWorkDir.XXXXXXXXXX`
 pushd . > /dev/null
 cd $AnalysisTestWorkDir
 pwd
-$SAME_SENSOR_HOME/tests/AnalysisTest.sh $cmsswvsn 2>&1
+$SAME_SENSOR_HOME/tests/AnalysisTest.sh 2>&1
 result=$?
 echo "AnalysisTest.sh executed with exit code " $result
 echo "</pre>"
@@ -75,18 +73,18 @@ if [ $result == $SAME_ERROR ] ; then
   err=1
 fi
 
-echo "<h3>Test analysis of data from /store/user </h3>"
-echo "<pre>"
-echo " SAME_SENSOR_HOME: " $SAME_SENSOR_HOME
-echo "Running $SAME_SENSOR_HOME/tests/AnalysisTestUser.sh $cmsswvsn 2>&1"
-AnalysisTestUserWorkDir=`mktemp -d AnalysisTestUserWorkDir.XXXXXXXXXX`
-pushd . > /dev/null
-cd $AnalysisTestUserWorkDir
-pwd
-$SAME_SENSOR_HOME/tests/AnalysisTestUser.sh $cmsswvsn 2>&1
-result=$?
-echo "</pre>"
-popd > /dev/null
+#echo "<h3>Test analysis of data from /store/user </h3>"
+#echo "<pre>"
+#echo " SAME_SENSOR_HOME: " $SAME_SENSOR_HOME
+#echo "Running $SAME_SENSOR_HOME/tests/AnalysisTestUser.sh 2>&1"
+#AnalysisTestUserWorkDir=`mktemp -d AnalysisTestUserWorkDir.XXXXXXXXXX`
+#pushd . > /dev/null
+#cd $AnalysisTestUserWorkDir
+#pwd
+#$SAME_SENSOR_HOME/tests/AnalysisTestUser.sh 2>&1
+#result=$?
+#echo "</pre>"
+#popd > /dev/null
 
 
 if [ $result != $SAME_OK ] ; then
@@ -96,7 +94,7 @@ fi
 
 
 if [ $err == 1 ] ; then
-    exit $SAME_ERROR
+    exit $SAME_WARNING
 fi
 
 if [ $warn == 1 ] ; then