From 08ae8d4ae50af904586c70b2a82d04a39ec8fcfc Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 8 Sep 2021 14:05:23 +0200 Subject: [PATCH 1/3] allow to use cmssw-config sources --- pr_testing/get_external_name.sh | 1 + pr_testing/test_multiple_prs.sh | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pr_testing/get_external_name.sh b/pr_testing/get_external_name.sh index 4c90adf44d9..d2c221d7f2c 100755 --- a/pr_testing/get_external_name.sh +++ b/pr_testing/get_external_name.sh @@ -10,6 +10,7 @@ ARRAY=( "cms-externals/incubator-mxnet:mxnet-predict" "cms-externals/eigen-git-mirror:eigen" "cms-externals/tensorflow:tensorflow-sources" + "cms-sw/cmssw-config:coral" ) case ${PKG_REPO} in diff --git a/pr_testing/test_multiple_prs.sh b/pr_testing/test_multiple_prs.sh index 8f666a28669..cf1cc783ef5 100755 --- a/pr_testing/test_multiple_prs.sh +++ b/pr_testing/test_multiple_prs.sh @@ -396,12 +396,18 @@ if ${BUILD_EXTERNAL} ; then # To make sure we always pick scram from local area rm -f $CMSSW_IB/config/scram_basedir ls $WORKSPACE/$BUILD_DIR/share/lcg/SCRAMV1 > $CMSSW_IB/config/scram_version - config_tag=$(grep '%define *configtag *V' $WORKSPACE/cmsdist/scram-project-build.file | sed 's|.*configtag *V|V|;s| *||g') - if [ "$(cat $CMSSW_IB/config/config_tag)" != "${config_tag}" ] ; then - git clone git@github.com:cms-sw/cmssw-config scram-buildrules - pushd scram-buildrules - git checkout ${config_tag} - popd + if [ -d $WORKSPACE/config ] ; then + cp -r $WORKSPACE/config scram-buildrules + else + config_tag=$(grep '%define *configtag *V' $WORKSPACE/cmsdist/scram-project-build.file | sed 's|.*configtag *V|V|;s| *||g') + if [ "$(cat $CMSSW_IB/config/config_tag)" != "${config_tag}" ] ; then + git clone git@github.com:cms-sw/cmssw-config scram-buildrules + pushd scram-buildrules + git checkout ${config_tag} + popd + fi + fi + if [ -d scram-buildrules ] ; then echo ${config_tag} > $WORKSPACE/$CMSSW_IB/config/config_tag mv $CMSSW_IB/config/SCRAM $CMSSW_IB/config/SCRAM.orig mv scram-buildrules/SCRAM $CMSSW_IB/config/SCRAM From 896444db676a8cf3f50b4218802e919672e0a3fa Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 8 Sep 2021 14:38:35 +0200 Subject: [PATCH 2/3] fix regexp for matching cmssw prs --- pr_testing/test_multiple_prs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_testing/test_multiple_prs.sh b/pr_testing/test_multiple_prs.sh index cf1cc783ef5..40b7ce9d40f 100755 --- a/pr_testing/test_multiple_prs.sh +++ b/pr_testing/test_multiple_prs.sh @@ -233,7 +233,7 @@ if [[ ${PKG_TOOL_VERSION} -lt 32 && ! -z $(echo ${UNIQ_REPO_NAMES} | tr ' ' '\n' fi # Do git pull --rebase for each PR except for /cmssw -for U_REPO in $(echo ${UNIQ_REPOS} | tr ' ' '\n' | grep -v '/cmssw' ); do +for U_REPO in $(echo ${UNIQ_REPOS} | tr ' ' '\n' | grep -v '/cmssw$' ); do FILTERED_PRS=$(echo ${PULL_REQUESTS} | tr ' ' '\n' | grep ${U_REPO} | tr '\n' ' ') for PR in ${FILTERED_PRS}; do ERR=false From 71a9d9b12505356ff84ad7013b3489e1df5723e0 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 8 Sep 2021 15:14:32 +0200 Subject: [PATCH 3/3] fix config tag --- pr_testing/test_multiple_prs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_testing/test_multiple_prs.sh b/pr_testing/test_multiple_prs.sh index 40b7ce9d40f..4b66efa5720 100755 --- a/pr_testing/test_multiple_prs.sh +++ b/pr_testing/test_multiple_prs.sh @@ -396,10 +396,10 @@ if ${BUILD_EXTERNAL} ; then # To make sure we always pick scram from local area rm -f $CMSSW_IB/config/scram_basedir ls $WORKSPACE/$BUILD_DIR/share/lcg/SCRAMV1 > $CMSSW_IB/config/scram_version + config_tag=$(grep '%define *configtag *V' $WORKSPACE/cmsdist/scram-project-build.file | sed 's|.*configtag *V|V|;s| *||g') if [ -d $WORKSPACE/config ] ; then cp -r $WORKSPACE/config scram-buildrules else - config_tag=$(grep '%define *configtag *V' $WORKSPACE/cmsdist/scram-project-build.file | sed 's|.*configtag *V|V|;s| *||g') if [ "$(cat $CMSSW_IB/config/config_tag)" != "${config_tag}" ] ; then git clone git@github.com:cms-sw/cmssw-config scram-buildrules pushd scram-buildrules