From 589fd257ada5a2ad4ded0fae60eac4b99e2e14c5 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 11 Jan 2022 15:52:07 +0100 Subject: [PATCH] for external PR tests, make sure to include latest cmssw merges --- pr_testing/test_multiple_prs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pr_testing/test_multiple_prs.sh b/pr_testing/test_multiple_prs.sh index af4350ad221e..be48cdd096cc 100755 --- a/pr_testing/test_multiple_prs.sh +++ b/pr_testing/test_multiple_prs.sh @@ -56,6 +56,8 @@ if [ $(echo ${ARCHITECTURE} | grep "_amd64_" | wc -l) -gt 0 ] ; then fi PRODUCTION_RELEASE=false +CMSSW_BRANCH=$(echo "${CONFIG_LINE}" | sed 's|.*RELEASE_BRANCH=||;s|;.*||') +if [ "${CMSSW_BRANCH}" = "master" ] ; then CMSSW_BRANCH=$(cd $CMS_BOT_DIR; python -c 'from releases import CMSSW_DEVEL_BRANCH; print CMSSW_DEVEL_BRANCH') ; fi if [ $(echo "${CONFIG_LINE}" | grep "PROD_ARCH=1" | wc -l) -gt 0 ] ; then if [ $(echo "${CONFIG_LINE}" | grep "ADDITIONAL_TESTS=" | wc -l) -gt 0 ] ; then PRODUCTION_RELEASE=true @@ -519,6 +521,7 @@ if ${BUILD_EXTERNAL} ; then SCRAM=scram bash -ex $WORKSPACE/$CMSSW_IB/config/SCRAM/hooks/runtime/00-nvidia-drivers || true fi if [ "$CMSSW_DEP" = "" ] ; then CMSSW_DEP="FWCore/Version" ; fi + git cms-init $CMSSW_BRANCH git cms-addpkg --ssh "$CMSSW_DEP" 2>&1 | tee -a $WORKSPACE/cmsswtoolconf.log if [ "X$BUILD_FULL_CMSSW" = "Xtrue" ] ; then pushd $WORKSPACE/$CMSSW_IB/src