From 8a5195ff16ca15f495869043b7256155e409385e Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Fri, 16 Feb 2018 21:30:07 +0100 Subject: [PATCH] use base ib instead of comparison ib --- run-pr-comparisons | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/run-pr-comparisons b/run-pr-comparisons index 6b4f47f91719..a7ff941d5b70 100755 --- a/run-pr-comparisons +++ b/run-pr-comparisons @@ -17,6 +17,9 @@ WFS_WITH_ERRORS='' MAPPING_FILE=wf_mapping.txt get_jenkins_artifacts ${BASELINE_DIR}/$MAPPING_FILE $WORKSPACE/$MAPPING_FILE +get_jenkins_artifacts ${PR_BASELINE_JOBDIR}/testsResults.txt $WORKSPACE/results/testsResults.txt +BASE_IB=$(grep '^BASE_IB;' $WORKSPACE/results/testsResults.txt | sed 's|.*;||') +if [ "X${BASE_IB}" = "X" ] ; then BASE_IB=$RELEASE_FORMAT ; fi ERRORS_FILE=wf_errors.txt get_jenkins_artifacts ${BASELINE_DIR}/$ERRORS_FILE $WORKSPACE/$ERRORS_FILE @@ -59,9 +62,9 @@ cat /proc/cpuinfo | grep "model name" >> $DETAILS_FILE ls /cvmfs/cms-ib.cern.ch || true export SCRAM_ARCH=$ARCHITECTURE echo "Set up release area at `date`" -scram project $RELEASE_FORMAT +scram project $BASE_IB set +x -cd $RELEASE_FORMAT +cd $BASE_IB eval `scram run -sh` if [ -e $CMSSW_RELEASE_BASE/src/Utilities/RelMon ] ; then mkdir -p src/Utilities/RelMon @@ -119,10 +122,7 @@ echo $WFS_WITH_DAS_INCONSISTENCY >> $WORKSPACE/$DAS_NON_CONSISTENT_WFS_FILE echo "Finished downloading files at `date`:" -get_jenkins_artifacts ${PR_BASELINE_JOBDIR}/testsResults.txt $WORKSPACE/results/testsResults.txt sed -i "s/COMPARISON;.*/COMPARISON;RUNNING/g" $WORKSPACE/results/testsResults.txt -BASE_IB=$(grep '^BASE_IB;' $WORKSPACE/results/testsResults.txt | sed 's|.*;||') -if [ "X${BASE_IB}" = "X" ] ; then BASE_IB=$RELEASE_FORMAT ; fi send_jenkins_artifacts $WORKSPACE/results/testsResults.txt ${PR_BASELINE_JOBDIR}/testsResults.txt # --------------------------------------------------------------------------