From 94ccd9b752b39f967433270a33e3f0310004819b Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 4 May 2022 16:34:19 -0700 Subject: [PATCH] more clean up --- selfdrive/test/process_replay/test_processes.py | 4 ++-- selfdrive/test/process_replay/update_refs.py | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/selfdrive/test/process_replay/test_processes.py b/selfdrive/test/process_replay/test_processes.py index a8231921cf..54e805ef6d 100755 --- a/selfdrive/test/process_replay/test_processes.py +++ b/selfdrive/test/process_replay/test_processes.py @@ -54,7 +54,7 @@ BASE_URL = "https://commadataci.blob.core.windows.net/openpilotci/" PROC_REPLAY_DIR = os.path.dirname(os.path.abspath(__file__)) # run the full test (including checks) when no args given -FULL_TEST = False # len(sys.argv) <= 1 # TODO: address this +FULL_TEST = len(sys.argv) <= 1 # or "CI" in os.environ def test_process(cfg, lr, cmp_log_fn, ignore_fields=None, ignore_msgs=None): @@ -172,7 +172,7 @@ if __name__ == "__main__": cmp_log_fn = os.path.join(PROC_REPLAY_DIR, f"{segment}_{cfg.proc_name}_{ref_commit}.bz2") results[segment][cfg.proc_name], log_msgs = test_process(cfg, lr, cmp_log_fn, args.ignore_fields, args.ignore_msgs) - # will overwrite any existing files, just like update_refs + # save logs so we can upload on process replay failure if args.save_logs: cur_log_fn = os.path.join(PROC_REPLAY_DIR, f"{segment}_{cfg.proc_name}_{cur_commit}.bz2") save_log(cur_log_fn, log_msgs) diff --git a/selfdrive/test/process_replay/update_refs.py b/selfdrive/test/process_replay/update_refs.py index 4ad6ab9a66..a589c1b2f9 100755 --- a/selfdrive/test/process_replay/update_refs.py +++ b/selfdrive/test/process_replay/update_refs.py @@ -1,17 +1,15 @@ #!/usr/bin/env python3 import argparse import os -import sys from selfdrive.test.openpilotci import upload_file, get_url from selfdrive.test.process_replay.compare_logs import save_log from selfdrive.test.process_replay.process_replay import replay_process, CONFIGS -from selfdrive.test.process_replay.test_processes import segments +from selfdrive.test.process_replay.test_processes import segments, PROC_REPLAY_DIR from selfdrive.version import get_commit from tools.lib.logreader import LogReader if __name__ == "__main__": - print(os.environ) parser = argparse.ArgumentParser(description="Updates the reference logs for the current commit") parser.add_argument("--no-upload", action="store_true") @@ -19,8 +17,7 @@ if __name__ == "__main__": args = parser.parse_args() assert args.no_upload != args.upload_only or not args.no_upload, "Both upload args can't be set" - process_replay_dir = os.path.dirname(os.path.abspath(__file__)) - ref_commit_fn = os.path.join(process_replay_dir, "ref_commit") + ref_commit_fn = os.path.join(PROC_REPLAY_DIR, "ref_commit") ref_commit = get_commit() if ref_commit is None: @@ -31,7 +28,7 @@ if __name__ == "__main__": for car_brand, segment in segments: if args.upload_only: for cfg in CONFIGS: - log_fn = os.path.join(process_replay_dir, f"{segment}_{cfg.proc_name}_{ref_commit}.bz2") + log_fn = os.path.join(PROC_REPLAY_DIR, f"{segment}_{cfg.proc_name}_{ref_commit}.bz2") upload_file(log_fn, os.path.basename(log_fn)) os.remove(log_fn) print('Uploaded {}'.format(log_fn)) @@ -42,11 +39,13 @@ if __name__ == "__main__": for cfg in CONFIGS: log_msgs = replay_process(cfg, lr) - log_fn = os.path.join(process_replay_dir, f"{segment}_{cfg.proc_name}_{ref_commit}.bz2") + log_fn = os.path.join(PROC_REPLAY_DIR, f"{segment}_{cfg.proc_name}_{ref_commit}.bz2") save_log(log_fn, log_msgs) if not args.no_upload: upload_file(log_fn, os.path.basename(log_fn)) - # os.remove(log_fn) + os.remove(log_fn) - print("Updated reference logs for commit: {}".format(ref_commit)) + print('done') + if args.upload_only: + print('new reference commit: {}'.format(ref_commit))