diff --git a/selfdrive/test/test_car_models.py b/selfdrive/test/test_car_models.py index 0fb5ed94f8..c4c0a9354f 100755 --- a/selfdrive/test/test_car_models.py +++ b/selfdrive/test/test_car_models.py @@ -21,7 +21,6 @@ from selfdrive.car.chrysler.values import CAR as CHRYSLER from selfdrive.car.subaru.values import CAR as SUBARU from selfdrive.car.volkswagen.values import CAR as VOLKSWAGEN from selfdrive.car.nissan.values import CAR as NISSAN -from selfdrive.car.mock.values import CAR as MOCK os.environ['NOCRASH'] = '1' @@ -59,35 +58,11 @@ def get_route_log(route_name): sys.exit(-1) routes = { - "975b26878285314d|2018-12-25--14-42-13": { - 'carFingerprint': CHRYSLER.PACIFICA_2018_HYBRID, - 'enableCamera': True, - }, - "b0c9d2329ad1606b|2019-01-06--10-11-23": { - 'carFingerprint': CHRYSLER.PACIFICA_2017_HYBRID, - 'enableCamera': True, - }, - "0607d2516fc2148f|2019-02-13--23-03-16": { - 'carFingerprint': CHRYSLER.PACIFICA_2019_HYBRID, - 'enableCamera': True, - }, "8190c7275a24557b|2020-01-29--08-33-58": { # 2020 model year 'carFingerprint': CHRYSLER.PACIFICA_2019_HYBRID, 'enableCamera': True, }, # This pacifica was removed because the fingerprint seemed from a Volt - #"9f7a7e50a51fb9db|2019-01-03--14-05-01": { - # 'carFingerprint': CHRYSLER.PACIFICA_2018, - # 'enableCamera': True, - #}, - "9f7a7e50a51fb9db|2019-01-17--18-34-21": { - 'carFingerprint': CHRYSLER.JEEP_CHEROKEE, - 'enableCamera': True, - }, - "192a598e34926b1e|2019-04-04--13-27-39": { - 'carFingerprint': CHRYSLER.JEEP_CHEROKEE_2019, - 'enableCamera': True, - }, "f1b4c567731f4a1b|2018-04-18--11-29-37": { 'carFingerprint': FORD.FUSION, 'enableCamera': False, @@ -100,47 +75,23 @@ routes = { 'carFingerprint': GM.CADILLAC_CT6, 'enableCamera': True, }, - "265007255e794bce|2018-11-24--22-08-31": { - 'carFingerprint': GM.CADILLAC_ATS, - 'enableCamera': True, - }, "c950e28c26b5b168|2018-05-30--22-03-41": { 'carFingerprint': GM.VOLT, 'enableCamera': True, }, # TODO: use another route that has radar data at start - "aadda448b49c99ad|2018-10-25--17-16-22": { - 'carFingerprint': GM.MALIBU, - 'enableCamera': True, - }, - "49c73650e65ff465|2018-11-19--16-58-04": { - 'carFingerprint': GM.HOLDEN_ASTRA, - 'enableCamera': True, - }, "7cc2a8365b4dd8a9|2018-12-02--12-10-44": { 'carFingerprint': GM.ACADIA, 'enableCamera': True, }, - "aa20e335f61ba898|2018-12-17--21-10-37": { - 'carFingerprint': GM.BUICK_REGAL, - 'enableCamera': False, - }, - "aa20e335f61ba898|2019-02-05--16-59-04": { - 'carFingerprint': GM.BUICK_REGAL, - 'enableCamera': True, + "aa20e335f61ba898|2019-02-05--16-59-04": { + 'carFingerprint': GM.BUICK_REGAL, + 'enableCamera': True, }, "7d44af5b7a1b2c8e|2017-09-16--01-50-07": { 'carFingerprint': HONDA.CIVIC, 'enableCamera': True, }, - "c9d60e5e02c04c5c|2018-01-08--16-01-49": { - 'carFingerprint': HONDA.CRV, - 'enableCamera': True, - }, - "1851183c395ef471|2018-05-31--18-07-21": { - 'carFingerprint': HONDA.CRV_5G, - 'enableCamera': True, - }, "232585b7784c1af4|2019-04-08--14-12-14": { 'carFingerprint': HONDA.CRV_HYBRID, 'enableCamera': True, @@ -153,10 +104,6 @@ routes = { 'carFingerprint': HONDA.ACURA_ILX, 'enableCamera': True, }, - "21aa231dee2a68bd|2018-01-30--04-54-41": { - 'carFingerprint': HONDA.ODYSSEY, - 'enableCamera': True, - }, "81722949a62ea724|2019-03-29--15-51-26": { 'carFingerprint': HONDA.ODYSSEY_CHN, 'enableCamera': False, @@ -165,36 +112,16 @@ routes = { 'carFingerprint': HONDA.ODYSSEY_CHN, 'enableCamera': True, }, - "5a2cfe4bb362af9e|2018-02-02--23-41-07": { - 'carFingerprint': HONDA.ACURA_RDX, - 'enableCamera': True, - }, - "3e9592a1c78a3d63|2018-02-08--20-28-24": { - 'carFingerprint': HONDA.PILOT, - 'enableCamera': True, - }, - "34a84d2b765df688|2018-08-28--12-41-00": { - 'carFingerprint': HONDA.PILOT_2019, - 'enableCamera': True, - }, - "900ad17e536c3dc7|2018-04-12--22-02-36": { - 'carFingerprint': HONDA.RIDGELINE, - 'enableCamera': True, - }, "f1b4c567731f4a1b|2018-06-06--14-43-46": { 'carFingerprint': HONDA.ACCORD, 'enableCamera': True, }, - "1582e1dc57175194|2018-08-15--07-46-07": { - 'carFingerprint': HONDA.ACCORD_15, - 'enableCamera': True, - }, "690c4c9f9f2354c7|2018-09-15--17-36-05": { 'carFingerprint': HONDA.ACCORDH, 'enableCamera': True, }, - "1632088eda5e6c4d|2018-06-07--08-03-18": { - 'carFingerprint': HONDA.CIVIC_BOSCH, + "0a96f86fcfe35964|2020-02-05--07-25-51": { + 'carFingerprint': HONDA.ODYSSEY, 'enableCamera': True, }, "d83f36766f8012a5|2020-02-05--18-42-21": { @@ -207,6 +134,14 @@ routes = { 'enableCamera': True, 'fingerprintSource': 'fixed', }, + "07d37d27996096b6|2020-03-04--21-57-27": { + 'carFingerprint': HONDA.PILOT, + 'enableCamera': True, + }, + "0a78dfbacc8504ef|2020-03-04--13-29-55": { + 'carFingerprint': HONDA.CIVIC_BOSCH, + 'enableCamera': True, + }, "38bfd238edecbcd7|2018-08-22--09-45-44": { 'carFingerprint': HYUNDAI.SANTA_FE, 'enableCamera': False, @@ -215,31 +150,16 @@ routes = { 'carFingerprint': HYUNDAI.SANTA_FE, 'enableCamera': True, }, - "a893a80e5c5f72c8|2019-01-14--20-02-59": { - 'carFingerprint': HYUNDAI.GENESIS, - 'enableCamera': True, - }, - "9d5fb4f0baa1b3e1|2019-01-14--17-45-59": { - 'carFingerprint': HYUNDAI.KIA_SORENTO, - 'enableCamera': True, - }, - "215cd70e9c349266|2018-11-25--22-22-12": { - 'carFingerprint': HYUNDAI.KIA_STINGER, - 'enableCamera': True, - }, - "31390e3eb6f7c29a|2019-01-23--08-56-00": { - 'carFingerprint': HYUNDAI.KIA_OPTIMA, - 'enableCamera': True, - }, - "53ac3251e03f95d7|2019-01-10--13-43-32": { - 'carFingerprint': HYUNDAI.ELANTRA, - 'enableCamera': True, - }, "f7b6be73e3dfd36c|2019-05-12--18-07-16": { 'carFingerprint': TOYOTA.AVALON, 'enableCamera': False, 'enableDsu': False, }, + "6cdecc4728d4af37|2020-02-23--15-44-18": { + 'carFingerprint': TOYOTA.CAMRY, + 'enableCamera': True, + 'enableDsu': False, + }, "f7b6be73e3dfd36c|2019-05-11--22-34-20": { 'carFingerprint': TOYOTA.AVALON, 'enableCamera': True, @@ -287,6 +207,12 @@ routes = { 'enableDsu': True, 'enableGasInterceptor': True, }, + "32a7df20486b0f70|2020-02-06--16-06-50": { + 'carFingerprint': TOYOTA.RAV4H, + 'enableCamera': True, + 'enableDsu': True, + 'enableGasInterceptor': False, + }, "cdf2f7de565d40ae|2019-04-25--03-53-41": { 'carFingerprint': TOYOTA.RAV4_TSS2, 'enableCamera': True, @@ -302,6 +228,11 @@ routes = { 'enableCamera': True, 'enableDsu': False, }, + "25057fa6a5a63dfb|2020-03-04--08-44-23": { + 'carFingerprint': TOYOTA.LEXUS_CTH, + 'enableCamera': True, + 'enableDsu': True, + }, "f49e8041283f2939|2019-05-29--13-48-33": { 'carFingerprint': TOYOTA.LEXUS_ESH_TSS2, 'enableCamera': False, @@ -336,49 +267,7 @@ routes = { 'enableCamera': True, 'enableDsu': False, }, - #FIXME: This works sometimes locally, but never in CI. Timing issue? - #"b0f5a01cf604185c|2018-01-31--20-11-39": { - # 'carFingerprint': TOYOTA.LEXUS_RXH, - # 'enableCamera': False, - # 'enableDsu': False, - #}, - "8ae193ceb56a0efe|2018-06-18--20-07-32": { - 'carFingerprint': TOYOTA.RAV4H, - 'enableCamera': True, - 'enableDsu': True, - }, - "fd10b9a107bb2e49|2018-07-24--16-32-42": { - 'carFingerprint': TOYOTA.CHR, - 'enableCamera': True, - 'enableDsu': False, - }, - "fd10b9a107bb2e49|2018-07-24--20-32-08": { - 'carFingerprint': TOYOTA.CHR, - 'enableCamera': False, - 'enableDsu': False, - }, - "b4c18bf13d5955da|2018-07-29--13-39-46": { - 'carFingerprint': TOYOTA.CHRH, - 'enableCamera': True, - 'enableDsu': False, - }, - "d2d8152227f7cb82|2018-07-25--13-40-56": { - 'carFingerprint': TOYOTA.CAMRY, - 'enableCamera': True, - 'enableDsu': False, - }, - "fbd011384db5e669|2018-07-26--20-51-48": { - 'carFingerprint': TOYOTA.CAMRYH, - 'enableCamera': True, - 'enableDsu': False, - }, - # TODO: This replay has no good model/video - # "c9fa2dd0f76caf23|2018-02-10--13-40-28": { - # 'carFingerprint': TOYOTA.CAMRYH, - # 'enableCamera': False, - # 'enableDsu': False, - # }, - # TODO: missingsome combos for highlander + # TODO: missing some combos for highlander "0a302ffddbb3e3d3|2020-02-08--16-19-08": { 'carFingerprint': TOYOTA.HIGHLANDER_TSS2, 'enableCamera': True, @@ -389,21 +278,11 @@ routes = { 'enableCamera': False, 'enableDsu': False, }, - "362d23d4d5bea2fa|2018-09-02--17-03-55": { - 'carFingerprint': TOYOTA.HIGHLANDERH, - 'enableCamera': True, - 'enableDsu': True, - }, "eb6acd681135480d|2019-06-20--20-00-00": { 'carFingerprint': TOYOTA.SIENNA, 'enableCamera': True, 'enableDsu': False, }, - "362d23d4d5bea2fa|2018-08-10--13-31-40": { - 'carFingerprint': TOYOTA.HIGHLANDERH, - 'enableCamera': False, - 'enableDsu': False, - }, "2e07163a1ba9a780|2019-08-25--13-15-13": { 'carFingerprint': TOYOTA.LEXUS_IS, 'enableCamera': True, @@ -427,14 +306,6 @@ routes = { 'carFingerprint': SUBARU.IMPREZA, 'enableCamera': True, }, - # Tesla route, should result in mock car - "07cb8a788c31f645|2018-06-17--18-50-29": { - 'carFingerprint': MOCK.MOCK, - }, - ## Route with no can data, should result in mock car. This is not supported anymore - #"bfa17080b080f3ec|2018-06-28--23-27-47": { - # 'carFingerprint': MOCK.MOCK, - #}, "fbbfa6af821552b9|2020-03-03--08-09-43": { 'carFingerprint': NISSAN.XTRAIL, 'enableCamera': True, @@ -442,8 +313,6 @@ routes = { } passive_routes = [ - "07cb8a788c31f645|2018-06-17--18-50-29", - #"bfa17080b080f3ec|2018-06-28--23-27-47", ] forced_dashcam_routes = [ @@ -455,45 +324,32 @@ forced_dashcam_routes = [ "fbbfa6af821552b9|2020-03-03--08-09-43", ] -# TODO: replace all these with public routes -non_public_routes = [ - "0607d2516fc2148f|2019-02-13--23-03-16", # CHRYSLER PACIFICA HYBRID 2019 - "3e9592a1c78a3d63|2018-02-08--20-28-24", # HONDA PILOT 2017 TOURING - "aa20e335f61ba898|2019-02-05--16-59-04", # BUICK REGAL ESSENCE 2018 - "1851183c395ef471|2018-05-31--18-07-21", # HONDA CR-V 2017 EX - "9d5fb4f0baa1b3e1|2019-01-14--17-45-59", # KIA SORENTO GT LINE 2018 - "b4c18bf13d5955da|2018-07-29--13-39-46", # TOYOTA C-HR HYBRID 2018 - "5a2cfe4bb362af9e|2018-02-02--23-41-07", # ACURA RDX 2018 ACURAWATCH PLUS - "362d23d4d5bea2fa|2018-08-10--13-31-40", # TOYOTA HIGHLANDER HYBRID 2018 - "aa20e335f61ba898|2018-12-17--21-10-37", # BUICK REGAL ESSENCE 2018 - "215cd70e9c349266|2018-11-25--22-22-12", # KIA STINGER GT2 2018 - "192a598e34926b1e|2019-04-04--13-27-39", # JEEP GRAND CHEROKEE 2019 - "34a84d2b765df688|2018-08-28--12-41-00", # HONDA PILOT 2019 ELITE - "b0c9d2329ad1606b|2019-01-06--10-11-23", # CHRYSLER PACIFICA HYBRID 2017 - "31390e3eb6f7c29a|2019-01-23--08-56-00", # KIA OPTIMA SX 2019 - "fd10b9a107bb2e49|2018-07-24--16-32-42", # TOYOTA C-HR 2018 - "9f7a7e50a51fb9db|2019-01-17--18-34-21", # JEEP GRAND CHEROKEE V6 2018 - "aadda448b49c99ad|2018-10-25--17-16-22", # CHEVROLET MALIBU PREMIER 2017 - "362d23d4d5bea2fa|2018-09-02--17-03-55", # TOYOTA HIGHLANDER HYBRID 2018 - "1582e1dc57175194|2018-08-15--07-46-07", # HONDA ACCORD 2018 LX 1.5T - "fd10b9a107bb2e49|2018-07-24--20-32-08", # TOYOTA C-HR 2018 - "265007255e794bce|2018-11-24--22-08-31", # CADILLAC ATS Premium Performance 2018 - "53ac3251e03f95d7|2019-01-10--13-43-32", # HYUNDAI ELANTRA LIMITED ULTIMATE 2017 - "21aa231dee2a68bd|2018-01-30--04-54-41", # HONDA ODYSSEY 2018 EX-L - "900ad17e536c3dc7|2018-04-12--22-02-36", # HONDA RIDGELINE 2017 BLACK EDITION - "975b26878285314d|2018-12-25--14-42-13", # CHRYSLER PACIFICA HYBRID 2018 - "8ae193ceb56a0efe|2018-06-18--20-07-32", # TOYOTA RAV4 HYBRID 2017 - "a893a80e5c5f72c8|2019-01-14--20-02-59", # HYUNDAI GENESIS 2018 - "49c73650e65ff465|2018-11-19--16-58-04", # HOLDEN ASTRA RS-V BK 2017 - "d2d8152227f7cb82|2018-07-25--13-40-56", # TOYOTA CAMRY 2018 - "07cb8a788c31f645|2018-06-17--18-50-29", # mock - "c9d60e5e02c04c5c|2018-01-08--16-01-49", # HONDA CR-V 2016 TOURING - "1632088eda5e6c4d|2018-06-07--08-03-18", # HONDA CIVIC HATCHBACK 2017 SEDAN/COUPE 2019 - "fbd011384db5e669|2018-07-26--20-51-48", # TOYOTA CAMRY HYBRID 2018 -] - # TODO: add routes for these cars -non_tested_cars = [TOYOTA.LEXUS_CTH, CHRYSLER.PACIFICA_2018] +non_tested_cars = [ + CHRYSLER.JEEP_CHEROKEE, + CHRYSLER.JEEP_CHEROKEE_2019, + CHRYSLER.PACIFICA_2017_HYBRID, + CHRYSLER.PACIFICA_2018, + CHRYSLER.PACIFICA_2018_HYBRID, + GM.CADILLAC_ATS, + GM.HOLDEN_ASTRA, + GM.MALIBU, + HONDA.ACCORD_15, + HONDA.ACURA_RDX, + HONDA.CRV, + HONDA.CRV_5G, + HONDA.PILOT_2019, + HONDA.RIDGELINE, + HYUNDAI.ELANTRA, + HYUNDAI.GENESIS, + HYUNDAI.KIA_OPTIMA, + HYUNDAI.KIA_SORENTO, + HYUNDAI.KIA_STINGER, + TOYOTA.CAMRYH, + TOYOTA.CHR, + TOYOTA.CHRH, + TOYOTA.HIGHLANDERH, +] if __name__ == "__main__": @@ -516,12 +372,9 @@ if __name__ == "__main__": results = {} for route, checks in routes.items(): - if route not in non_public_routes: - print("GETTING ROUTE LOGS") - get_route_log(route) - print("DONE GETTING ROUTE LOGS") - elif "UNLOGGER_PATH" not in os.environ: - continue + print("GETTING ROUTE LOGS") + get_route_log(route) + print("DONE GETTING ROUTE LOGS") params = Params() params.clear_all() @@ -542,10 +395,7 @@ if __name__ == "__main__": # Start unlogger print("Start unlogger") - if route in non_public_routes: - unlogger_cmd = [os.path.join(BASEDIR, os.environ['UNLOGGER_PATH']), route] - else: - unlogger_cmd = [os.path.join(BASEDIR, 'tools/replay/unlogger.py'), route, '/tmp'] + unlogger_cmd = [os.path.join(BASEDIR, 'tools/replay/unlogger.py'), route, '/tmp'] unlogger = subprocess.Popen(unlogger_cmd + ['--disable', 'frame,encodeIdx,plan,pathPlan,liveLongitudinalMpc,radarState,controlsState,liveTracks,liveMpc,sendcan,carState,carControl,carEvents,carParams', '--no-interactive'], preexec_fn=os.setsid) print("Check sockets") diff --git a/selfdrive/test/update_ci_routes.py b/selfdrive/test/update_ci_routes.py index 9f90c5ea32..09b8d170d7 100755 --- a/selfdrive/test/update_ci_routes.py +++ b/selfdrive/test/update_ci_routes.py @@ -5,7 +5,7 @@ import subprocess from common.basedir import BASEDIR from azure.storage.blob import BlockBlobService -from selfdrive.test.test_car_models import routes as test_car_models_routes, non_public_routes +from selfdrive.test.test_car_models import routes as test_car_models_routes from selfdrive.test.process_replay.test_processes import segments as replay_segments from xx.chffr.lib import azureutil from xx.chffr.lib.storage import upload_dir_serial, download_dir_tpe @@ -14,6 +14,7 @@ from xx.chffr.lib.storage import _DATA_ACCOUNT_PRODUCTION, _DATA_ACCOUNT_CI, _DA SOURCES = [ (_DATA_ACCOUNT_PRODUCTION, _DATA_BUCKET_PRODUCTION), (_DATA_ACCOUNT_PRODUCTION, "preserve"), + (_DATA_ACCOUNT_CI, "commadataci"), ] DEST_KEY = azureutil.get_user_token(_DATA_ACCOUNT_CI, "openpilotci") @@ -64,9 +65,8 @@ if __name__ == "__main__": # sync test_car_models routes for r in list(test_car_models_routes.keys()): - if r not in non_public_routes: - if not sync_to_ci_public(r): - failed_routes.append(r) + if not sync_to_ci_public(r): + failed_routes.append(r) if len(failed_routes):