Skip to content
Snippets Groups Projects
Commit cf00d016 authored by Edward Moyse's avatar Edward Moyse Committed by Adam Edward Barton
Browse files

Fix for ATLINFR-5383 : only check for files for DiffPool

Fix for ATLINFR-5383 : only check for files for DiffPool
parent cd2d1899
No related branches found
No related tags found
29 merge requests!78241Draft: FPGATrackSim: GenScan code refactor,!78236Draft: Switching Streams https://its.cern.ch/jira/browse/ATR-27417,!78056AFP monitoring: new synchronization and cleaning,!78041AFP monitoring: new synchronization and cleaning,!77990Updating TRT chip masks for L1TRT trigger simulation - ATR-28372,!77733Draft: add new HLT NN JVT, augmented with additional tracking information,!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76475Punchthrough AF3 implementation in FastG4,!76474Punchthrough AF3 implementation in FastG4,!76343Draft: MooTrackBuilder: Recalibrate NSW hits in refine method,!75729New implementation of ZDC nonlinear FADC correction.,!75703Draft: Update to HI han config for HLT jets,!75184Draft: Update file heavyions_run.config,!74430Draft: Fixing upper bound for Delayed Jet Triggers,!73963Changing the path of the histograms to "Expert" area,!73875updating ID ART reference plots,!73874AtlasCLHEP_RandomGenerators: Fix cppcheck warnings.,!73449Add muon detectors to DarkJetPEBTLA partial event building,!73343Draft: [TrigEgamma] Add photon ringer chains on bootstrap mechanism,!72336Fixed TRT calibration crash,!72176Draft: Improving L1TopoOnline chain that now gets no-empty plots. Activating it by default,!72012Draft: Separate JiveXMLConfig.py into Config files,!71876Fix MET trigger name in MissingETMonitoring,!71820Draft: Adding new TLA End-Of-Fill (EOF) chains and removing obsolete DIPZ chains,!71664Fix for ATLINFR-5383 : only check for files for DiffPool
......@@ -101,10 +101,8 @@ def process_log_file(url, branch, test_name):
# Okay, we have a digest change
failing_tests[branch].append(process_digest_change(text, ami_tag, mr_number, human_readable_date, test_name))
if 'ERROR Your change breaks the frozen tier0 policy in test' in text:
failing_tests[branch].append(process_diffpool_change(text, ami_tag, mr_number, human_readable_date, test_name))
if 'ERROR Your change breaks the frozen derivation policy in test' in text:
if 'ERROR Your change breaks the frozen tier0 policy in test' in text or 'ERROR Your change breaks the frozen derivation policy in test' in text:
# DiffPool change
failing_tests[branch].append(process_diffpool_change(text, ami_tag, mr_number, human_readable_date, test_name))
return
......@@ -367,18 +365,23 @@ def summarise_failing_tests(check_for_duplicates = True):
print (' * Branch: {}'.format(branch))
for test in tests:
print(' - ', test)
if os.path.exists(test.new_version_directory):
msg = f'WARNING: The directory {test.new_version_directory} already exists. Are you sure you want to overwrite the existing references?'
if input("%s (y/N) " % msg).lower() != 'y':
if test.type == 'DiffPool':
if not test.new_version_directory:
print('FATAL: No path to "new version" for test {} of type DiffPool.'.format(test.name))
sys.exit(1)
if (test.existing_ref not in reference_folders):
reference_folders.append(test.existing_ref)
elif check_for_duplicates:
print('FATAL: Found two tests which both change the same reference file: {}, which is not supported.'.format(test.existing_ref))
print('Consider running again in --test-run mode, to get a copy of the copy commands that could be run.')
print('The general advice is to take the largest file (since it will have the most events), and/or take the non-legacy one.')
sys.exit(1)
if os.path.exists(test.new_version_directory):
msg = f'WARNING: The directory {test.new_version_directory} already exists. Are you sure you want to overwrite the existing references?'
if input("%s (y/N) " % msg).lower() != 'y':
sys.exit(1)
if (test.existing_ref not in reference_folders):
reference_folders.append(test.existing_ref)
elif check_for_duplicates:
print('FATAL: Found two tests which both change the same reference file: {}, which is not supported.'.format(test.existing_ref))
print('Consider running again in --test-run mode, to get a copy of the copy commands that could be run.')
print('The general advice is to take the largest file (since it will have the most events), and/or take the non-legacy one.')
sys.exit(1)
mr = test.mr
return 'https://gitlab.cern.ch/atlas/athena/-/merge_requests/'+mr
......
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