diff --git a/Jenkinsfile b/Jenkinsfile index a49a749590..80360dc097 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -148,9 +148,9 @@ pipeline { ["build", "SCONS_CACHE=1 scons -j4"], ["test sounds", "nosetests -s selfdrive/test/test_sounds.py"], ["test boardd loopback", "nosetests -s selfdrive/boardd/tests/test_boardd_loopback.py"], - ["test loggerd", "CI=1 python selfdrive/loggerd/tests/test_loggerd.py"], - ["test encoder", "CI=1 python selfdrive/loggerd/tests/test_encoder.py"], - //["test camerad", "CI=1 SEND_REAR=1 SEND_FRONT=1 python selfdrive/camerad/test/test_camerad.py"], // wait for shelf refactor + ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"], + ["test encoder", "python selfdrive/loggerd/tests/test_encoder.py"], + //["test camerad", "SEND_REAR=1 SEND_FRONT=1 python selfdrive/camerad/test/test_camerad.py"], // wait for shelf refactor //["test updater", "python installer/updater/test_updater.py"], ]) } @@ -160,6 +160,8 @@ pipeline { steps { phone_steps("tici", [ ["build", "SCONS_CACHE=1 scons -j16"], + ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"], + ["test encoder", "python selfdrive/loggerd/tests/test_encoder.py"], ]) } } diff --git a/selfdrive/loggerd/tests/test_encoder.py b/selfdrive/loggerd/tests/test_encoder.py index 9d53c8339d..19aca41fcb 100755 --- a/selfdrive/loggerd/tests/test_encoder.py +++ b/selfdrive/loggerd/tests/test_encoder.py @@ -66,9 +66,7 @@ class TestEncoder(unittest.TestCase): def test_log_rotation(self, record_front): Params().put("RecordFront", str(int(record_front))) - num_segments = random.randint(80, 150) - if "CI" in os.environ: - num_segments = random.randint(15, 20) # ffprobe is slow on comma two + num_segments = int(os.getenv("SEGMENTS", random.randint(10, 15))) # wait for loggerd to make the dir for first segment route_prefix_path = None