undo removal plotjuggler

pull/24009/head
Gijs Koning 2022-03-20 23:11:27 +01:00
parent d39c3f8573
commit cd0bbe532a
1 changed files with 28 additions and 16 deletions

View File

@ -5,6 +5,7 @@ on:
env:
BASE_IMAGE: openpilot-base
IMAGE_NAME_SIM: openpilot-sim
DOCKER_REGISTRY: ghcr.io/commaai
DOCKER_LOGIN: docker login ghcr.io -u adeebshihadeh -p ${{ secrets.CONTAINER_TOKEN }}
OPENPILOT_DIR: "/openpilot"
@ -15,13 +16,31 @@ env:
docker pull $DOCKER_REGISTRY/$BASE_IMAGE:latest || true
docker build --cache-from $DOCKER_REGISTRY/$BASE_IMAGE:latest -t $DOCKER_REGISTRY/$BASE_IMAGE:latest -t $BASE_IMAGE:latest -f Dockerfile.openpilot_base .
BUILD_SIM: |
docker pull $DOCKER_REGISTRY/$IMAGE_NAME:latest || true
docker build --cache-from $DOCKER_REGISTRY/$IMAGE_NAME:latest -t $DOCKER_REGISTRY/$IMAGE_NAME:latest -f tools/sim/Dockerfile.sim .
RUN: docker run --shm-size 1G -v $PWD:/tmp/openpilot -e PYTHONPATH=/tmp/openpilot -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e \
docker pull $DOCKER_REGISTRY/$IMAGE_NAME_SIM:latest || true
docker build --cache-from $DOCKER_REGISTRY/$IMAGE_NAME_SIM:latest -t $DOCKER_REGISTRY/$IMAGE_NAME_SIM:latest -f tools/sim/Dockerfile.sim .
RUN_BASE: docker run --shm-size 1G -v $PWD:/tmp/openpilot -e PYTHONPATH=/tmp/openpilot -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e \
GITHUB_REPOSITORY -e GITHUB_RUN_ID -v /tmp/comma_download_cache:/tmp/comma_download_cache $BASE_IMAGE /bin/sh -c
RUN2: docker run --shm-size 1G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e PYTHONPATH=/tmp/openpilot -e NUM_JOBS -e JOB_ID -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -v /tmp/scons_cache:/tmp/scons_cache -v /tmp/comma_download_cache:/tmp/comma_download_cache $BASE_IMAGE /bin/sh -c
RUNSIM: docker run --net=host --rm -it --gpus all --device=/dev/dri:/dev/dri --device=/dev/input:/dev/input -v /tmp/.X11-unix:/tmp/.X11-unix --shm-size 1G -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -w "$OPENPILOT_DIR/tools/sim" ghcr.io/commaai/openpilot-sim:latest /bin/sh -c
RUN_SIM: docker run --net=host --rm -it --gpus all --device=/dev/dri:/dev/dri --device=/dev/input:/dev/input -v /tmp/.X11-unix:/tmp/.X11-unix \
--shm-size 1G -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -w "$OPENPILOT_DIR/tools/sim" ghcr.io/commaai/openpilot-sim:latest /bin/sh -c
jobs:
plotjuggler:
name: plotjuggler
runs-on: ubuntu-20.04
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build Docker image
run: eval "$BUILD_BASE"
- name: Unit test
run: |
${{ env.RUN_BASE }} "scons -j$(nproc) --directory=/tmp/openpilot/cereal && \
apt-get update && \
apt-get install -y libdw-dev libqt5svg5-dev libqt5x11extras5-dev && \
cd /tmp/openpilot/tools/plotjuggler && \
./test_plotjuggler.py"
test_simulator:
name: test_simulator
runs-on: ubuntu-20.04
@ -46,20 +65,13 @@ jobs:
-it \
carlasim/carla:0.9.12 \
/bin/bash timeout $TIMEOUT_SIM ./CarlaUE4.sh -opengl -nosound -RenderOffScreen -benchmark -fps=20 -quality-level=LOW
# - name: Run unit tests
# run: |
# ${{ env.RUN2 }} ./tools/sim/test_bridge.py --timeout 5
# ${{ env.RUN2 }} "scons -j$(nproc) --test && \
# ./tools/sim/bridge.py"
- name: check bridge.py connect with carla
run: | # todo maybe timeout $TIMEOUT_SIM is not needed in real CI
${{ env.RUNSIM }} "timeout $TIMEOUT_SIM ./test_bridge.py --timeout $TIMEOUT_Test"
- name: test bridge.py connect with carla
run: |
${{ env.RUN_SIM }} "timeout $TIMEOUT_SIM ./test_bridge.py --timeout $TIMEOUT_Test"
build_simulator:
name: build_simulator
runs-on: ubuntu-20.04
timeout-minutes: 50
env:
IMAGE_NAME: openpilot-sim
if: github.repository == 'commaai/openpilot'
steps:
- uses: actions/checkout@v2
@ -87,4 +99,4 @@ jobs:
if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
run: |
$DOCKER_LOGIN
docker push $DOCKER_REGISTRY/$IMAGE_NAME:latest
docker push $DOCKER_REGISTRY/$IMAGE_NAME_SIM:latest