Skip to content

Commit becdcbc

Browse files
committed
use cmsswdata.xml to find the changes data packages
1 parent 554294b commit becdcbc

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

pr_testing/test_multiple_prs.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,6 @@ CMSSW_ORG='cms-sw'
452452
BUILD_EXTERNAL=false
453453
CMSDIST_ONLY=true # asume cmsdist only
454454
CHECK_HEADER_TESTS=false
455-
CMSSW_DATA_PKGS=""
456455
for U_REPO in ${UNIQ_REPOS}; do
457456
PKG_REPO=$(echo ${U_REPO} | sed 's/#.*//')
458457
PKG_NAME=$(echo ${U_REPO} | sed 's|.*/||')
@@ -481,9 +480,6 @@ for U_REPO in ${UNIQ_REPOS}; do
481480
exit 0
482481
fi
483482
done
484-
if [ "${PKG_ORG}" = "cms-data" ] ; then
485-
CMSSW_DATA_PKGS="${CMSSW_DATA_PKGS} $(echo ${PKG_NAME} | tr - /)"
486-
fi
487483
;;
488484
esac
489485
done
@@ -708,7 +704,14 @@ if ${BUILD_EXTERNAL} ; then
708704
touch $WORKSPACE/cmsswtoolconf.log
709705
CTOOLS=$WORKSPACE/$CMSSW_IB/config/toolbox/${ARCHITECTURE}/tools/selected
710706
BTOOLS=${CTOOLS}.backup
707+
diff -u ${CTOOLS}/cmsswdata.xml ${BTOOLS}/cmsswdata.xml | grep 'CMSSW_DATA_PACKAGE=' | grep -E '^[-+]' | sed 's|.*CMSSW_DATA_PACKAGE="||;s|=.*||' | sort | uniq
711708
mv ${CTOOLS} ${BTOOLS}
709+
if [ "$BUILD_FULL_CMSSW" != "true" ] ; then
710+
CMSSW_DATA_PKGS=""
711+
if [ -e ${BTOOLS}/cmsswdata.xml ] ; then
712+
CMSSW_DATA_PKGS=$(diff -u ${CTOOLS}/cmsswdata.xml ${BTOOLS}/cmsswdata.xml | grep 'CMSSW_DATA_PACKAGE=' | grep -E '^[-+]' | sed 's|.*CMSSW_DATA_PACKAGE="||;s|=.*||' | sort | uniq)
713+
fi
714+
fi
712715
TOOL_CONF_VERSION=$(ls -d $WORKSPACE/$BUILD_DIR/$ARCHITECTURE/cms/cmssw-tool-conf/* | sed 's|.*/||')
713716
echo "${CMS_WEEKLY_REPO}.${PR_EXTERNAL_REPO}/${TOOL_CONF_VERSION}" > $WORKSPACE/cmssw-tool-conf.txt
714717
echo "CMSSWTOOLCONF_VERSION;OK,External tool conf,See log,cmssw-tool-conf.txt" >> ${RESULTS_DIR}/toolconf.txt

0 commit comments

Comments
 (0)