Skip to content

enable few non-default flavors to use estats for PR tests #2760

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

Merged
smuzaffar merged 1 commit into from
May 21, 2026
Merged

enable few non-default flavors to use estats for PR tests #2760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions build-cmssw-ib-with-patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ rm -rf $WORKSPACE/../build-cache &
cd $WORKSPACE
rm -rf ${WRKDIR}/SPECS

BUILD_JOBS=3
[ "$CMDBUILD_JOBS" != "" ] && BUILD_JOBS="$CMDBUILD_JOBS"
BUILD_NPROC=$(nproc)
CMSBUILD_OVERRIDE_ARGS=""
[ "$CMSBUILD_JOBS" != "" ] && CMSBUILD_OVERRIDE_ARGS="--builders ${CMSBUILD_JOBS}"

BUILD_NPROC=$(nproc)
BUILD_JOBS=2
case $ARCHITECTURE in
*_mic_*) export BUILD_ARCH=`echo $ARCHITECTURE | cut -f1,2 -d_` ;;
*_armv7hl_*) BUILD_JOBS=1; BUILD_NPROC=3 ;;
Expand Down Expand Up @@ -111,6 +112,7 @@ if [ $(echo ${PKGTOOLS_TAG} | cut -d- -f 2) -gt 31 ] ; then
EX_OPTS="--force-tag"
CMSBUILD_CMD="${CMSBUILD_CMD} --delete-build-directory --monitor --log-deps --tag hash $(cmsbuild_args "${BUILD_OPTS}" "${MULTIARCH_OPTS}" "${ARCHITECTURE}")"
fi
CMSBUILD_CMD="${CMSBUILD_CMD} ${CMSBUILD_OVERRIDE_ARGS}"
[ $(grep 'upload-package-store-s3' PKGTOOLS/cmsBuild | wc -l) -eq 0 ] || CMSBUILD_CMD="${CMSBUILD_CMD} --upload-package-store-s3"

## build and upload revision based packages
Expand Down
14 changes: 9 additions & 5 deletions build-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@ ISSUE_NUMBER=$5
DRY_RUN_PARAM=$6
CMSDIST_HASH=$7
CMSBUILD_BUILDER=$8
[ "${CMSBUILD_BUILDER}" = "" ] && CMSBUILD_BUILDER=2
echo DATE=`date`
HERE=$WORKSPACE/build
BUILD_DIR=$HERE/$CMSSW_X_Y_Z-build
mkdir -p $BUILD_DIR
BUILD_NPROC=$(nproc)
QUEUE=$CMSSW_QUEUE

CMSBUILD_OVERRIDE_ARGS=""
[ "${CMSBUILD_BUILDER}" != "" ] && CMSBUILD_OVERRIDE_ARGS="--builders ${CMSBUILD_BUILDER}"
DEFAULT_BUILDER=2

#Workaround to fix py3-tomlkit which fails to build it if finds .git in the working directory
if [ -d .git ] ; then mv .git backup.git ; fi

Expand Down Expand Up @@ -84,7 +87,7 @@ pushd $BUILD_DIR
fi
sh -e PKGTOOLS/scripts/prepare-cmsdist $CMSSW_X_Y_Z $ARCHITECTURE > $WORKSPACE/prepare-cmsdist.log 2>&1
echo DATE=`date`
CMSBUILD_CMD="PKGTOOLS/cmsBuild --server http://${CMSREP_SERVER}/cgi-bin/cmspkg --upload-server ${CMSREP_SERVER} --repo cms --architecture=$ARCHITECTURE -j $BUILD_NPROC"
CMSBUILD_CMD="PKGTOOLS/cmsBuild --server http://${CMSREP_SERVER}/cgi-bin/cmspkg --upload-server ${CMSREP_SERVER} --repo cms --architecture=$ARCHITECTURE -j $BUILD_NPROC --builders ${DEFAULT_BUILDER}"
case `uname -s` in
Darwin ) MD5_CMD=md5;;
* ) MD5_CMD=md5sum;;
Expand All @@ -94,6 +97,7 @@ pushd $BUILD_DIR
else
CMSBUILD_CMD="${CMSBUILD_CMD} --tag `echo $QUEUE | $MD5_CMD | tr '0123456789' 'ghijklmnop' | cut -b1-6`"
fi
CMSBUILD_CMD="${CMSBUILD_CMD} ${CMSBUILD_OVERRIDE_ARGS}"
if [ -f CMSDIST/fakesystem.spec ] ; then
PYTHONPATH= $CMSBUILD_CMD -i fake build fakesystem
PYTHONPATH= $CMSBUILD_CMD -i fake --sync-back upload fakesystem
Expand All @@ -105,16 +109,16 @@ pushd $BUILD_DIR
TOOL_CONF_PACKAGES=`grep '^%define \(build\|\)directpkgreqs' SPECS/cms/cmssw$PATCH/*/spec | grep -v '%{nil}' | sed 's|.*directpkgreqs[ \t]*||' | tr ' ' '\n' | cut -f2 -d/ | sort | uniq | tr '\n' ' '`
[ -e CMSDIST/gcc-fixincludes.spec ] && TOOL_CONF_PACKAGES="gcc-fixincludes ${TOOL_CONF_PACKAGES}"
EXT_FAILED=false
PYTHONPATH= $CMSBUILD_CMD --builders ${CMSBUILD_BUILDER} build $TOOL_CONF_PACKAGES || EXT_FAILED=true
PYTHONPATH= $CMSBUILD_CMD build $TOOL_CONF_PACKAGES || EXT_FAILED=true
echo DATE=`date`
if $EXT_FAILED ; then
BLD_PKGS=$(ls RPMS/${ARCHITECTURE}/ | grep '.rpm$' | cut -d+ -f2 | grep -v 'coral-debug')
if [ "X$BLD_PKGS" != "X" ] ; then PYTHONPATH= $CMSBUILD_CMD --builders ${CMSBUILD_BUILDER} --sync-back upload ${BLD_PKGS} ; fi
if [ "X$BLD_PKGS" != "X" ] ; then PYTHONPATH= $CMSBUILD_CMD --sync-back upload ${BLD_PKGS} ; fi
rm -rf tmp
exit 1
fi
if [ `ls RPMS/${ARCHITECTURE} | wc -l` -gt 0 ] ; then
PYTHONPATH= $CMSBUILD_CMD --builders ${CMSBUILD_BUILDER} --sync-back upload $TOOL_CONF_PACKAGES
PYTHONPATH= $CMSBUILD_CMD --sync-back upload $TOOL_CONF_PACKAGES
echo DATE=`date`
PYTHONPATH= $CMSBUILD_CMD deprecate-local $TOOL_CONF_PACKAGES
echo DATE=`date`
Expand Down
1 change: 1 addition & 0 deletions cmsrep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function cmsbuild_args()
without:* ) arg="${arg} --build-without=$(echo $x | sed 's|^without:||;s|:|,|g')" ;;
system:* ) arg="${arg} --use-system-tools=$(echo $x | sed 's|^system:||;s|:|,|g')" ;;
microarchs:* ) arg="${arg} --vectorization=$(echo $x | sed 's|^microarchs:||;s|:|,|g')" ;;
builders:* ) arg="${arg} --builders=$(echo $x | sed 's|^builders:||;s|:|,|g')" ;;
* ) BLD_OPTS="${BLD_OPTS},$x" ;;
esac
done
Expand Down
36 changes: 18 additions & 18 deletions config.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/ma
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/fp;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_FP_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,2,4;BUILD_OPTS=frame_pointer;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_NONLTO_X;DOCKER_IMG=cmssw;PR_TESTS=1;BUILD_OPTS=no-lto,microarchs:x86-64-v2;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/cudart;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_CUDART_X;DOCKER_IMG=cmssw;BUILD_HOUR=0,23;BUILD_DAY=0,3;ADDITIONAL_TESTS=gpu-qa;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_MULTIARCHS_X;DOCKER_IMG=cmssw;PR_TESTS=1;BUILD_OPTS=microarchs:x86-64-v2;
SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_MULTIARCHSV4_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=1,4;BUILD_OPTS=microarchs:x86-64-v4;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/clang;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_CLANG_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_OPTS=no-lto;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_ASAN_X;BUILD_HOUR=0,23;DOCKER_IMG=cmssw;BUILD_DAY=1,3,5;PR_TESTS=1;BUILD_OPTS=no-lto;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_UBSAN_X;BUILD_HOUR=0,23;DOCKER_IMG=cmssw;BUILD_DAY=1,3,5;BUILD_OPTS=no-lto;PR_TESTS=1;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g4;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_GEANT4_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,3;BUILD_OPTS=no-vecgeom;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g4;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_G4VECGEOM_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,3;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=CMSSW_17_0_EVOLUTION_X;RELEASE_QUEUE=CMSSW_17_0_EVOLUTION_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=1,5;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g4adept;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_G4ADEPT_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,3;BUILD_OPTS=no-biglib,no-lto;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_MULTIARCHS_X;DOCKER_IMG=cmssw;PR_TESTS=1;BUILD_OPTS=microarchs:x86-64-v2,estats;
SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_MULTIARCHSV4_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=1,4;BUILD_OPTS=microarchs:x86-64-v4,estats;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/clang;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_CLANG_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_OPTS=no-lto,estats;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_ASAN_X;BUILD_HOUR=0,23;DOCKER_IMG=cmssw;BUILD_DAY=1,3,5;PR_TESTS=1;BUILD_OPTS=no-lto,estats;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_UBSAN_X;BUILD_HOUR=0,23;DOCKER_IMG=cmssw;BUILD_DAY=1,3,5;BUILD_OPTS=no-lto,estats;PR_TESTS=1;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g4;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_GEANT4_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,3;BUILD_OPTS=no-vecgeom,estats;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g4;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_G4VECGEOM_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,3;BUILD_OPTS=estats;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=CMSSW_17_0_EVOLUTION_X;RELEASE_QUEUE=CMSSW_17_0_EVOLUTION_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=1,5;BUILD_OPTS=estats;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g4adept;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_G4ADEPT_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=0,3;BUILD_OPTS=no-biglib,no-lto,estats;
SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23,00;BUILD_OPTS=microarchs:x86-64-v2;ADDITIONAL_TESTS=gpu-qa;
SCRAM_ARCH=el8_aarch64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/master;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/devel;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_DEVEL_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_OPTS=warnings,microarchs:x86-64-v2;PR_TESTS=1;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/rootmaster;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_ROOT6_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;PR_TESTS=1;
SCRAM_ARCH=el8_aarch64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/rootmaster;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_ROOT6_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/root640;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_ROOT640_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;PR_TESTS=1;BUILD_DAY=1,3,5;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/devel;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_DEVEL_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_OPTS=warnings,microarchs:x86-64-v2,estats;PR_TESTS=1;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/rootmaster;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_ROOT6_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;PR_TESTS=1;BUILD_OPTS=estats;
SCRAM_ARCH=el8_aarch64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/rootmaster;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_ROOT6_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_OPTS=estats;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/root640;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_ROOT640_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;PR_TESTS=1;BUILD_DAY=1,3,5;BUILD_OPTS=estats;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/rootmodule;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_CXXMODULE_X;DOCKER_IMG=cmssw;BUILD_DAY=1,5;BUILD_HOUR=23;DEBUG_EXTERNALS=root;
SCRAM_ARCH=el10_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda;
SCRAM_ARCH=fc42_riscv64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda:tensorflow:valgrind:openloops:acts,system:rpm:autotools:gcc;
SCRAM_ARCH=el9_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,microarchs:x86-64-v2;
SCRAM_ARCH=el9_amd64_gcc16;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/gcc16;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,microarchs:x86-64-v2;
SCRAM_ARCH=el10_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,estat;
SCRAM_ARCH=fc42_riscv64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda:tensorflow:valgrind:openloops:acts,system:rpm:autotools:gcc,builder:1;
SCRAM_ARCH=el9_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=estat,cpp23,without:cuda,microarchs:x86-64-v2;
SCRAM_ARCH=el9_amd64_gcc16;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/gcc16;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=estat,cpp23,without:cuda,microarchs:x86-64-v2;
SCRAM_ARCH=el8_amd64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_OPTS=microarchs:x86-64-v2;
SCRAM_ARCH=el8_amd64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_CPP23_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,microarchs:x86-64-v2;
SCRAM_ARCH=el8_amd64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_CPP23_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,microarchs:x86-64-v2,estat;
SCRAM_ARCH=el9_amd64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_OPTS=microarchs:x86-64-v2;
SCRAM_ARCH=el8_aarch64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_17_0_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_17_0_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_DAY=2,4;IB_ONLY=1;
SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_16_1_X/master;RELEASE_BRANCH=CMSSW_16_1_X;RELEASE_QUEUE=CMSSW_16_1_X;DOCKER_IMG=cmssw;BUILD_PATCH_RELEASE=1;ADDITIONAL_TESTS=HLT,static-checks,fwlite,cfipython,profiling,crab,hlt-p2-timing,class-versions,gpu-relvals,gpu-qa;PR_TESTS=1;PROD_ARCH=1;PRS_TEST_CLANG=1;REQUIRED_TEST=true;BUILD_OPTS=microarchs:x86-64-v2;
Expand Down
10 changes: 6 additions & 4 deletions pr_testing/test_multiple_prs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,8 +555,7 @@ if ${BUILD_EXTERNAL} ; then
fi

# Build the whole cmssw-tool-conf toolchain
[ "${CMDBUILD_JOBS}" = "" ] && CMDBUILD_JOBS=2
CMSBUILD_ARGS="--builders ${CMDBUILD_JOBS} --tag ${PR_NUM}"
CMSBUILD_ARGS="--builders 2 --tag ${PR_NUM}"
BUILD_OPTS=$(echo $CONFIG_LINE | tr ';' '\n' | grep "^BUILD_OPTS=" | sed 's|^BUILD_OPTS=||')
MULTIARCH_OPTS=$(echo $CONFIG_LINE | tr ';' '\n' | grep "^MULTIARCH_OPTS=" | sed 's|^MULTIARCH_OPTS=||')

Expand All @@ -572,11 +571,14 @@ if ${BUILD_EXTERNAL} ; then
if [ "$(echo "${BUILD_OPTS}" | tr ',' '\n' | grep '^estats$')" = "estats" ] ; then
if [ ${PKG_TOOL_VERSION} -ge 34 ] ; then
if ${CMS_BOT_DIR}/get-external-avg-stats.py ${ARCHITECTURE} > ${WORKSPACE}/externals-resource-usage.json ; then
CMSBUILD_ARGS="${CMSBUILD_ARGS} --estats ${WORKSPACE}/externals-resource-usage.json --builders ${NCPU}"
CMSBUILD_ARGS="${CMSBUILD_ARGS} --estats ${WORKSPACE}/externals-resource-usage.json"
CMSBUILD_JOBS="${NCPU}"
fi
fi
fi
fi
CMSBUILD_OVERRIDE_ARGS=""
[ "${CMSBUILD_JOBS}" != "" ] && CMSBUILD_OVERRIDE_ARGS="--builders ${CMSBUILD_JOBS}"
if [ $(grep 'upload-package-store-s3' pkgtools/cmsBuild | wc -l) -gt 0 ] ; then
[ "${CMSBOT_SET_ENV_NO_PACKAGE_STORE}" = "true" ] && UPLOAD_TO_PACKAGE_STORE=false
if $UPLOAD_TO_PACKAGE_STORE ; then
Expand All @@ -589,7 +591,7 @@ if ${BUILD_EXTERNAL} ; then
PKGS="cms-common cms-git-tools cmssw-tool-conf"
COMPILATION_CMD="PYTHONPATH= ./pkgtools/cmsBuild --server http://${CMSREP_IB_SERVER}/cgi-bin/cmspkg --upload-server ${CMSREP_IB_SERVER} \
${CMSBUILD_ARGS} -i $WORKSPACE/$BUILD_DIR $REF_REPO \
$SOURCE_FLAG --arch $ARCHITECTURE -j ${NCPU} $(cmsbuild_args "${BUILD_OPTS}" "${MULTIARCH_OPTS}" "${ARCHITECTURE}")"
$SOURCE_FLAG --arch $ARCHITECTURE -j ${NCPU} $(cmsbuild_args "${BUILD_OPTS}" "${MULTIARCH_OPTS}" "${ARCHITECTURE}") ${CMSBUILD_OVERRIDE_ARGS}"
PR_EXTERNAL_REPO="PR_$(echo ${RPM_UPLOAD_REPO}_${CMSSW_QUEUE}_${ARCHITECTURE} | md5sum | sed 's| .*||' | tail -c 9)"
if [ -e cmsdist/cmssw-tool-conf.spec ] ; then
echo "#PR ${PR_EXTERNAL_REPO}" >> cmsdist/cmssw-tool-conf.spec
Expand Down
Loading