From 2e5247056a84c03cb6eb68bec55cd656ead5c3a7 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 29 Oct 2020 16:51:09 -0700 Subject: [PATCH] ubuntu 16.04 -> 20.04 (#2378) old-commit-hash: 719c5e3598846a6f3fa08c85bb811d197e0c6d0a --- .github/workflows/sim_tests.yaml | 2 +- .github/workflows/test.yaml | 20 ++++++++++---------- Dockerfile.openpilot_base | 5 +++-- Pipfile | 4 ++-- Pipfile.lock | 4 ++-- cereal | 2 +- laika_repo | 2 +- opendbc | 2 +- panda | 2 +- rednose_repo | 2 +- selfdrive/test/process_replay/ref_commit | 2 +- tools/README.md | 4 ++-- tools/ubuntu_setup.sh | 2 +- tools/webcam/README.md | 4 ++-- 14 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/sim_tests.yaml b/.github/workflows/sim_tests.yaml index f3f626b8ab..bac6239cb8 100644 --- a/.github/workflows/sim_tests.yaml +++ b/.github/workflows/sim_tests.yaml @@ -6,7 +6,7 @@ on: jobs: docker_build: name: build container - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 if: github.event_name == 'schedule' && github.repository == 'commaai/openpilot' steps: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c88a3c95ba..8747b937fc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,7 +22,7 @@ env: jobs: build_release: name: build release - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 env: TEST_DIR: tmppilot @@ -79,7 +79,7 @@ jobs: build_webcam: name: build webcam - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 90 steps: - uses: actions/checkout@v2 @@ -100,7 +100,7 @@ jobs: docker_push: name: docker push - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot' needs: static_analysis # hack to ensure slow tests run first since this and static_analysis are fast @@ -120,7 +120,7 @@ jobs: docker_push_prebuilt: name: docker push prebuilt - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 if: github.event_name == 'status' && github.repository == 'commaai/openpilot' needs: [static_analysis, unit_tests, process_replay, test_longitudinal, test_car_models] @@ -138,7 +138,7 @@ jobs: static_analysis: name: static analysis - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 steps: - uses: actions/checkout@v2 @@ -151,7 +151,7 @@ jobs: valgrind: name: valgrind - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 steps: - uses: actions/checkout@v2 @@ -185,7 +185,7 @@ jobs: unit_tests: name: unit tests - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 steps: - uses: actions/checkout@v2 @@ -216,7 +216,7 @@ jobs: process_replay: name: process replay - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 steps: - uses: actions/checkout@v2 @@ -254,7 +254,7 @@ jobs: test_longitudinal: name: longitudinal - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 steps: - uses: actions/checkout@v2 @@ -283,7 +283,7 @@ jobs: test_car_models: name: test car models - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 timeout-minutes: 50 steps: - uses: actions/checkout@v2 diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base index f676158de2..6667809e40 100644 --- a/Dockerfile.openpilot_base +++ b/Dockerfile.openpilot_base @@ -1,10 +1,12 @@ -FROM ubuntu:16.04 +FROM ubuntu:20.04 ENV PYTHONUNBUFFERED 1 +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ autoconf \ build-essential \ bzip2 \ + ca-certificates \ capnproto \ libcapnp-dev \ clang \ @@ -35,7 +37,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ocl-icd-opencl-dev \ opencl-headers \ python-dev \ - python-pip \ qt5-default \ qtmultimedia5-dev \ sudo \ diff --git a/Pipfile b/Pipfile index d95756a530..91253d7ac0 100644 --- a/Pipfile +++ b/Pipfile @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efaa83445e7234356951f3d0e5058801c1370748ea615ed71251b6bbee403b74 -size 2006 +oid sha256:e58d6656969e9fd4f09376a28960b8eccebe200fc3b72250c0b59192b53f76ab +size 2014 diff --git a/Pipfile.lock b/Pipfile.lock index fa891950a2..6946461b8c 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d2e235fd2e6da5f59595a511d492decadb44d890f86e4faba71cc720f3cc504 -size 177319 +oid sha256:c95e2705366b41510e8b3789778ac0cacfcdda61c7d6277f4fbd8285894efd48 +size 190871 diff --git a/cereal b/cereal index 58545fafa6..d87b4bbef9 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 58545fafa6a3bc25c2548c238f29eed6cc8c6a77 +Subproject commit d87b4bbef90404ef4d2629db11499d163d0d15aa diff --git a/laika_repo b/laika_repo index bfb59fa18d..353d8237dd 160000 --- a/laika_repo +++ b/laika_repo @@ -1 +1 @@ -Subproject commit bfb59fa18dd05d8766101b16624d020965793a14 +Subproject commit 353d8237ddd4f76db697e2f74a07b8a119eda09c diff --git a/opendbc b/opendbc index 34416de087..244e8807df 160000 --- a/opendbc +++ b/opendbc @@ -1 +1 @@ -Subproject commit 34416de0874c523122e594dd1656737263c7985b +Subproject commit 244e8807df75feb88c0fe825569bcd87409bd250 diff --git a/panda b/panda index 9fb584b20c..49c7615ed3 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 9fb584b20cbbee80aa3e4c98416da726dcd4c1f2 +Subproject commit 49c7615ed3ee663e34953e151950e523db774dc3 diff --git a/rednose_repo b/rednose_repo index 10bf459f33..8de93012b9 160000 --- a/rednose_repo +++ b/rednose_repo @@ -1 +1 @@ -Subproject commit 10bf459f33adcdb75ca6851555f5ff870cfea10e +Subproject commit 8de93012b924574afaaac4b5c5119a7303706385 diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index ce96fdbb74..40a5b6e2af 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -4e8a51e064de900f13638d0b641383d7a72e845e \ No newline at end of file +955869126912fa93325ff5ef9cd94310378e3082 \ No newline at end of file diff --git a/tools/README.md b/tools/README.md index 810bb50907..537aa60d2c 100644 --- a/tools/README.md +++ b/tools/README.md @@ -24,7 +24,7 @@ Table of Contents Requirements ============ -openpilot tools and the following setup steps are developed and tested on Ubuntu 16.04, MacOS 10.14.2 and Python 3.8.2. +openpilot tools and the following setup steps are developed and tested on Ubuntu 20.04, MacOS 10.14.2 and Python 3.8.2. Setup ============ @@ -167,6 +167,6 @@ Welcomed contributions ============= * Documentation: code comments, better tutorials, etc.. -* Support for other platforms other than Ubuntu 16.04. +* Support for other platforms other than Ubuntu 20.04. * Performance improvements: the tools have been developed on high-performance workstations (12+ logical cores with 32+ GB of RAM), so they are not optimized for running efficiently. For example, `ui.py` might not be able to run real-time on most PCs. * More tools: anything that you think might be helpful to others. diff --git a/tools/ubuntu_setup.sh b/tools/ubuntu_setup.sh index 95e7f83809..2f7a1f6390 100755 --- a/tools/ubuntu_setup.sh +++ b/tools/ubuntu_setup.sh @@ -41,7 +41,7 @@ sudo apt-get update && sudo apt-get install -y \ ocl-icd-opencl-dev \ opencl-headers \ python-dev \ - python-pip \ + python3-pip \ qt5-default \ qtmultimedia5-dev \ screen \ diff --git a/tools/webcam/README.md b/tools/webcam/README.md index 3e0daaceab..c8def05d53 100644 --- a/tools/webcam/README.md +++ b/tools/webcam/README.md @@ -1,8 +1,8 @@ Run openpilot with webcam on PC/laptop ===================== What's needed: -- Ubuntu 16.04 -- Python 3.7.3 +- Ubuntu 20.04 +- Python 3.8.2 - GPU (recommended) - Two USB webcams, at least 720p and 78 degrees FOV (e.g. Logitech C920/C615) - [Car harness](https://comma.ai/shop/products/comma-car-harness) with black panda (or the outdated grey panda/giraffe combo) to connect to your car