From 4950233c45b71ba4c7809074369045f89e4ea63a Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 4 May 2022 16:51:30 -0700 Subject: [PATCH] replace flags with CI and clean up --- .../test/process_replay/test_processes.py | 6 +-- selfdrive/test/process_replay/update_refs.py | 45 ++++++++----------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/selfdrive/test/process_replay/test_processes.py b/selfdrive/test/process_replay/test_processes.py index a15213bed2..6bf8235804 100755 --- a/selfdrive/test/process_replay/test_processes.py +++ b/selfdrive/test/process_replay/test_processes.py @@ -7,7 +7,7 @@ from typing import Any from selfdrive.car.car_helpers import interface_names from selfdrive.test.openpilotci import get_url from selfdrive.test.process_replay.compare_logs import compare_logs, save_log -from selfdrive.test.process_replay.process_replay import CONFIGS, PROC_REPLAY_DIR, check_enabled, replay_process +from selfdrive.test.process_replay.process_replay import CONFIGS, PROC_REPLAY_DIR, CI, check_enabled, replay_process from selfdrive.version import get_commit from tools.lib.logreader import LogReader @@ -124,8 +124,6 @@ if __name__ == "__main__": help="Extra fields or msgs to ignore (e.g. carState.events)") parser.add_argument("--ignore-msgs", type=str, nargs="*", default=[], help="Msgs to ignore (e.g. carEvents)") - parser.add_argument("--save-logs", action="store_true", - help="Whether to save the generated log files") args = parser.parse_args() cars_whitelisted = len(args.whitelist_cars) > 0 @@ -171,7 +169,7 @@ if __name__ == "__main__": results[segment][cfg.proc_name], log_msgs = test_process(cfg, lr, cmp_log_fn, args.ignore_fields, args.ignore_msgs) # save logs so we can upload on process replay failure - if args.save_logs: + if CI: 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 588893a942..8d53636172 100755 --- a/selfdrive/test/process_replay/update_refs.py +++ b/selfdrive/test/process_replay/update_refs.py @@ -1,22 +1,17 @@ #!/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, PROC_REPLAY_DIR +from selfdrive.test.process_replay.process_replay import CONFIGS, PROC_REPLAY_DIR, CI, replay_process from selfdrive.test.process_replay.test_processes import segments from selfdrive.version import get_commit from tools.lib.logreader import LogReader -if __name__ == "__main__": - parser = argparse.ArgumentParser(description="Updates the reference logs for the current commit") - - parser.add_argument("--no-upload", action="store_true") - parser.add_argument("--upload-only", action="store_true") # TODO: split this out into own file upload_refs? - args = parser.parse_args() - assert args.no_upload != args.upload_only or not args.no_upload, "Both upload args can't be set" +if __name__ == "__main__": + no_upload = "--no-upload" in sys.argv ref_commit_fn = os.path.join(PROC_REPLAY_DIR, "ref_commit") ref_commit = get_commit() @@ -25,27 +20,25 @@ if __name__ == "__main__": with open(ref_commit_fn, "w") as f: f.write(ref_commit) - for car_brand, segment in segments: - if args.upload_only: + # only upload + if CI: + for car_brand, segment in segments: for cfg in CONFIGS: 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)) - continue - - r, n = segment.rsplit("--", 1) - lr = LogReader(get_url(r, n)) + else: + for car_brand, segment in segments: + r, n = segment.rsplit("--", 1) + lr = LogReader(get_url(r, n)) - for cfg in CONFIGS: - log_msgs = replay_process(cfg, lr) - log_fn = os.path.join(PROC_REPLAY_DIR, f"{segment}_{cfg.proc_name}_{ref_commit}.bz2") - save_log(log_fn, log_msgs) + for cfg in CONFIGS: + log_msgs = replay_process(cfg, lr) + 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) + if not no_upload: + upload_file(log_fn, os.path.basename(log_fn)) + os.remove(log_fn) - print('done') - if args.upload_only: - print('new reference commit: {}'.format(ref_commit)) + print('done\nnew reference commit: {}'.format(ref_commit))