Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow to use cmssw-config sources #1622

Merged
merged 3 commits into from
Sep 8, 2021
Merged

allow to use cmssw-config sources #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08ae8d4
allow to use cmssw-config sources
smuzaffar Sep 8, 2021
896444d
fix regexp for matching cmssw prs
smuzaffar Sep 8, 2021
71a9d9b
fix config tag
smuzaffar Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pr_testing/get_external_name.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 12 additions & 6 deletions pr_testing/test_multiple_prs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -397,11 +397,17 @@ if ${BUILD_EXTERNAL} ; then
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 [email protected]: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
if [ "$(cat $CMSSW_IB/config/config_tag)" != "${config_tag}" ] ; then
git clone [email protected]: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
Expand Down