Skip to content
Snippets Groups Projects
Commit 5c869e1e authored by John Kenneth Anders's avatar John Kenneth Anders
Browse files

Merge branch 'cherry-pick-bddec603-21.0' into '21.0'

Sweeping !23970 from master to 21.0.
Add ImportError to check_log patterns

See merge request !24027
parents 54b2ee57 782b9c45
40 merge requests!46457Draft: Adding the tools to run over data,!46454Draft: Adding the tools to be able to run over data,!45045WIP: Include another condition for hit merging in FCS_StepInfoSD.cxx,!45043Merge branch 'Update-DAOD_IDNCB' into '21.2',!44869Draft: Update to candidate store,!4217921.9-first_steps-InDetTrackingGeometryXML,!42171Add LAr cell DQ plots to UPC stream,!40342WIP: ATR-22546 - add missing trigger to MC16a,!39162Draft: Insert BCM' support,!38765Bis78 cabling,!37483Fix in monitoring of Pixel FE errors,!36893Fix size of RPC active region in BIS78 and strip material,!3645821.9: Improving material map description (ATLITKSW-127),!36293WIP pixel updates,!34993KF-input adding jXERHO to the AOD outputs,!34864LH rings in front ot HR rigs,!34763Fix L1_4jJ15.0ETA25 item definition (ATR-21261),!3473421.0 fix dq servers,!33996WIP: Correct MM zpositions,!3291021.3 salva s0,!3288421.0 salva s8,!3217421.9 - Bug fix for test stream creation in RD53BEncodingTool,!3135321.3,!3134821.9 README Update,!31345Add HEC sampling fractions macros,!31136added also PUsub for LargeR jets,!31123WIP: Master ttmdev,!3036121.9 fixing bug with layer indices in PixelRDOAnalysis,!29617IDPerfmonZmumu updates,!29454Idpvm 21.0 fix typo in trackselection config,!29085TRT modification for fractional charged particles,!28623Overlay as part of FastChain transform in 21.3,!28497ART tests - fixing the bugs,!27668Massimos 21.3 bis78,!27254WIP: Exclusive jets request -- Fix ExclusiveJets algo / ATR-17320,!26790Fixes for Simulation ART jobs (ATLASSIM-4309),!26592Master upload 2018 global monitoring scripts p2,!26017Merge 21.3.15 into 21.9,!24191Merge 21.0.98 into 21.3 branch,!24027Sweeping !23970 from master to 21.0. Add ImportError to check_log patterns
......@@ -101,7 +101,7 @@ sub scan_logfile(){
@patterns=();
if ($errors) {
push @patterns, "^ERROR | ERROR | FATAL |CRITICAL |ABORT_CHAIN ";
push @patterns, "^Exception\:|^Caught signal|^Core dump|Traceback|Shortened traceback|stack trace|^Algorithm stack\:|IncludeError|inconsistent use of tabs and spaces in indentation|glibc detected|tcmalloc\: allocation failed"
push @patterns, "^Exception\:|^Caught signal|^Core dump|Traceback|Shortened traceback|stack trace|^Algorithm stack\:|IncludeError|ImportError|inconsistent use of tabs and spaces in indentation|glibc detected|tcmalloc\: allocation failed"
}
if ($warnings) {
push @patterns, "WARNING ";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment