From 7a1f3197e29a30dec87ef7d74a336323eb0abbd5 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Sat, 7 Apr 2018 16:46:26 +0200 Subject: [PATCH] add panda python package test and fix safety test --- .circleci/config.yml | 25 ++++++++++++++++++++++--- tests/build/Dockerfile | 8 ++++++++ tests/safety/Dockerfile | 3 +-- 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 tests/build/Dockerfile diff --git a/.circleci/config.yml b/.circleci/config.yml index 1f4ce168b3cbe2..6c19bcf2d0b1b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,14 +1,33 @@ version: 2 jobs: - build: + safety: machine: docker_layer_caching: true steps: - checkout - run: name: Build image - command: "docker build -t panda -f tests/safety/Dockerfile ." + command: "docker build -t panda_safety -f tests/safety/Dockerfile ." - run: name: Run safety test command: | - docker run panda /bin/bash -c "cd /panda/tests/safety; ./test.sh" + docker run panda_safety /bin/bash -c "cd /panda/tests/safety; ./test.sh" + build: + machine: + docker_layer_caching: true + steps: + - checkout + - run: + name: Build image + command: "docker build -t panda_build -f tests/build/Dockerfile ." + - run: + name: Test python package installer + command: | + docker run panda_build /bin/bash -c "cd /panda; python setup.py install" + +workflows: + version: 2 + main: + jobs: + - safety + - build diff --git a/tests/build/Dockerfile b/tests/build/Dockerfile new file mode 100644 index 00000000000000..d8b9660277fa1d --- /dev/null +++ b/tests/build/Dockerfile @@ -0,0 +1,8 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi gperf texinfo help2man python python-pip +RUN pip install setuptools + +COPY . /panda + +WORKDIR /panda diff --git a/tests/safety/Dockerfile b/tests/safety/Dockerfile index 317e0dd76a015f..9381fdc4085759 100644 --- a/tests/safety/Dockerfile +++ b/tests/safety/Dockerfile @@ -2,6 +2,5 @@ FROM ubuntu:16.04 RUN apt-get update && apt-get install -y clang make python python-pip COPY tests/safety/requirements.txt /panda/tests/safety/requirements.txt -RUN pip install -r /panda/safety/tests/requirements.txt +RUN pip install -r /panda/tests/safety/requirements.txt COPY . /panda -