Skip to content

Commit

Permalink
ubuntu 16.04 -> 20.04 (commaai#2378)
Browse files Browse the repository at this point in the history
  • Loading branch information
adeebshihadeh authored Oct 29, 2020
1 parent 9a9e4ba commit 719c5e3
Show file tree
Hide file tree
Showing 14 changed files with 844 additions and 675 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/sim_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.openpilot_base
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ hexdump = "*"
libusb1 = "*"
numpy = "*"
psutil = "*"
pycapnp = "*"
pycapnp = "==1.0.0b1"
cryptography = "*"
python-dateutil = "*"
pyzmq = "*"
Expand Down
1,468 changes: 818 additions & 650 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cereal
2 changes: 1 addition & 1 deletion laika_repo
2 changes: 1 addition & 1 deletion opendbc
2 changes: 1 addition & 1 deletion panda
2 changes: 1 addition & 1 deletion rednose_repo
2 changes: 1 addition & 1 deletion selfdrive/test/process_replay/ref_commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4e8a51e064de900f13638d0b641383d7a72e845e
955869126912fa93325ff5ef9cd94310378e3082
4 changes: 2 additions & 2 deletions tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
============
Expand Down Expand Up @@ -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.
2 changes: 1 addition & 1 deletion tools/ubuntu_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions tools/webcam/README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 719c5e3

Please sign in to comment.