Add testing dependencies and bump used ev-cli version to 0.0.24 (#9)

* Bump used ev-cli version to 0.0.24 * Add gtest-dev * Add lcov * Add gcovr Signed-off-by: Andreas Heinrich <[email protected]> * Update docker/images/build-kit/debian.Dockerfile Co-authored-by: Fabian Klemm <[email protected]> Signed-off-by: Andreas Heinrich <[email protected]> * Update docker/images/build-kit/alpine.Dockerfile Co-authored-by: Fabian Klemm <[email protected]> Signed-off-by: Andreas Heinrich <[email protected]> --------- Signed-off-by: Andreas Heinrich <[email protected]> Co-authored-by: Fabian Klemm <[email protected]>
EVerest · Dec 5, 2023 · 59f93dc · 59f93dc
1 parent a7119ba
commit 59f93dc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/docker/images/build-kit/alpine.Dockerfile b/docker/images/build-kit/alpine.Dockerfile
@@ -4,6 +4,9 @@ FROM alpine:3.17
 ARG EXT_MOUNT=/ext
 ARG EVEREST_CMAKE_PATH=/usr/lib/cmake/everest-cmake
 
+# Add edge/testing repository to enable installation of lcov
+RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
+
 RUN apk update && \
     apk add --no-cache \
         # basic command line tools
@@ -26,7 +29,11 @@ RUN apk update && \
         clang-extra-tools \
         ccache \
         # python3 support
-        py3-pip
+        py3-pip \
+        # required for testing
+        gtest-dev \
+        lcov
+
 
 # additional packages
 RUN apk add --no-cache \
@@ -59,10 +66,11 @@ RUN python3 -m pip install \
     aiofile>=3.7.4 \
     py4j>=0.10.9.5 \
     netifaces>=0.11.0 \
-    python-dateutil>=2.8.2
+    python-dateutil>=2.8.2 \
+    gcovr==5.0
 
 # install ev-cli
-RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@b862a940afa37a99350483fd550e88acaff3e9a7#subdirectory=ev-dev-tools
+RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@4a5ce956722929325cef3c2d73a8919c6d2e4013#subdirectory=ev-dev-tools
 
 # install everest-testing
 RUN python3 -m pip install git+https://github.com/EVerest/[email protected]#subdirectory=everest-testing

diff --git a/docker/images/build-kit/debian.Dockerfile b/docker/images/build-kit/debian.Dockerfile
@@ -24,7 +24,10 @@ RUN apt-get update \
         clang-tidy-13 \
         ccache \
         # python3 support
-        python3-pip
+        python3-pip \
+        # required for testing
+        libgtest-dev \
+        lcov
 
 # additional packages
 RUN apt-get install --no-install-recommends -y \
@@ -55,10 +58,11 @@ RUN python3 -m pip install \
     aiofile>=3.7.4 \
     py4j>=0.10.9.5 \
     netifaces>=0.11.0 \
-    python-dateutil>=2.8.2
+    python-dateutil>=2.8.2 \
+    gcovr==5.0
 
 # install ev-cli
-RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@b862a940afa37a99350483fd550e88acaff3e9a7#subdirectory=ev-dev-tools
+RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@4a5ce956722929325cef3c2d73a8919c6d2e4013#subdirectory=ev-dev-tools
 
 # install everest-testing
 RUN python3 -m pip install git+https://github.com/EVerest/[email protected]#subdirectory=everest-testing