From e05717d3842eba199d7acce9e84b3c488c883c87 Mon Sep 17 00:00:00 2001
From: David Mendez <david.mendez@cern.ch>
Date: Thu, 4 Dec 2014 16:06:54 +0100
Subject: [PATCH] Add the baseline script to cms-bot, it now also generates a
 file with the path of the root files. The comparison script now checks these
 paths to download the files to compare.

---
 run-ib-comparison-baseline | 28 ++++++++++++++++++++++++++++
 run-pr-comparisons         | 24 +++++++++++-------------
 2 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100755 run-ib-comparison-baseline

diff --git a/run-ib-comparison-baseline b/run-ib-comparison-baseline
new file mode 100755
index 0000000000000..7cce9d17be530
--- /dev/null
+++ b/run-ib-comparison-baseline
@@ -0,0 +1,28 @@
+#!/bin/sh -ex
+export SCRAM_ARCH=$ARCHITECTURE
+scram project $RELEASE_FORMAT
+cd $RELEASE_FORMAT
+eval `scram run -sh`
+mkdir -p "$WORKSPACE/matrix-results"
+pushd "$WORKSPACE/matrix-results"
+
+  case $RELEASE_FORMAT in 
+    *THREADED*)
+    echo "Threaded!"
+    runTheMatrix.py --command '--customise FWCore/Concurrency/dropNonMTSafe.dropNonMTSafe' -s -j $(getconf _NPROCESSORS_ONLN) -l 401,1306,101.0,1003.0;;
+    *) runTheMatrix.py -s -j $(getconf _NPROCESSORS_ONLN) -l 401,1306,101.0,1003.0
+  esac
+
+  MAPPING_FILE=wf_mapping.txt
+  ROOT_FILES=`find $WORKSPACE/matrix-results -name DQM*.root`
+  PKGTOOLS_PATH=$WORKSPACE/pkgtools
+  for f in $ROOT_FILES
+  do
+    WF_PATH=`echo $f | sed 's/^\.\///'`
+    WF_NUMBER=`echo $WF_PATH | sed 's/_.*$//'`
+    echo $WF_PATH >> $MAPPING_FILE
+  done
+
+popd
+
+
diff --git a/run-pr-comparisons b/run-pr-comparisons
index ef9f2ac75cb69..2b87ee12d63e6 100755
--- a/run-pr-comparisons
+++ b/run-pr-comparisons
@@ -2,19 +2,17 @@
 BASE_URL=$ARTIFACTS_MACHINE:/data/sdt/SDT/jenkins-artifacts/ib-baseline-tests/$RELEASE_FORMAT/$ARCHITECTURE/$REAL_ARCH/matrix-results/
 PULL_REQUEST_BASE_URL=$ARTIFACTS_MACHINE:/data/sdt/SDT/jenkins-artifacts/pull-request-integration/PR-$PULL_REQUEST_NUMBER/$PULL_REQUEST_JOB_ID/runTheMatrix-results/
 
-WF_NAME_4_22='4.22_RunCosmics2011A+RunCosmics2011A+RECOCOSD+ALCACOSD+SKIMCOSD+HARVESTDC/DQM_V0001_R000160960__Global__CMSSW_X_Y_Z__RECO.root'
-WF_NAME_4_53='4.53_RunPhoton2012B+RunPhoton2012B+HLTD+RECODreHLT+HARVESTDreHLT+MINIAODDreHLT/DQM_V0001_R000194533__Global__CMSSW_X_Y_Z__RECO.root'
-WF_NAME_5_1='5.1_TTbar+TTbarFS+HARVESTFS/DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO.root'
-WF_NAME_8_0='8.0_BeamHalo+BeamHalo+DIGICOS+RECOCOS+ALCABH+HARVESTCOS/DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO.root'
-WF_NAME_25_0='25.0_TTbar+TTbar+DIGI+RECO+HARVEST+ALCATT/DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO.root'
-#WF_NAME_401_0='401.0_TTbarNewMix+TTbarFSPU+HARVESTFS/DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO.root'
-WF_NAME_1000_0='1000.0_RunMinBias2011A+RunMinBias2011A+TIER0+SKIMD+HARVESTDfst2+ALCASPLIT/DQM_V0001_R000165121__Global__CMSSW_X_Y_Z__RECO.root'
-#WF_NAME_101_0='101.0_SingleElectronE120EHCAL+SingleElectronE120EHCAL/DQM_V0001_R000165121__Express__PCLTest__ALCAPROMPT.root'
-WF_NAME_1306_0='1306.0_SingleMuPt1_UP15+SingleMuPt1_UP15+DIGIUP15+RECOUP15+HARVESTUP15+MINIAODMCUP15/DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO.root'
-#WF_NAME_1003_0='1003.0_RunMinBias2012A+RunMinBias2012A+RECODDQM+HARVESTDDQM/DQM_V0001_R000191226__Global__CMSSW_X_Y_Z__RECO.root'
-#WF_NAME_1001_0='1001.0_RunMinBias2011A+RunMinBias2011A+TIER0EXP+ALCAEXP+ALCAHARVD/DQM_V0001_R000165121__Express__PCLTest__ALCAPROMPT.root'
-
-WORKFLOWS_TO_COMPARE=$WF_NAME_4_22,$WF_NAME_4_53,$WF_NAME_5_1,$WF_NAME_8_0,$WF_NAME_25_0,$WF_NAME_1000_0,$WF_NAME_1306_0
+MAPPING_FILE=wf_mapping.txt
+rsync $BASE_URL$MAPPING_FILE $WORKSPACE
+
+for wf in ${WORKFLOWS_LIST//,/ }
+do
+  WF_PATH=`grep $wf $WORKSPACE/$MAPPING_FILE`
+  WORKFLOWS_TO_COMPARE=$WORKFLOWS_TO_COMPARE,$WF_PATH
+done
+
+#remove first ,
+WORKFLOWS_TO_COMPARE=`echo $WORKFLOWS_TO_COMPARE | sed 's/^.//'`
 
 DETAILS_FILE=$WORKSPACE/'comparisonDetails.txt'
 echo 'BASE_IB;'$RELEASE_FORMAT >> $DETAILS_FILE