Merge branch 'develop' into mueller/heater-health-if

CHANGELOG.md

@@ -17,6 +17,8 @@ list yields a list of all related PRs for each release.
 - Build unittest as default side product of hosted builds
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/244
 - Let CI/CD build host build and run unittest side product in same step
+- Catch2 pre-installed in CI/CD docker container, Xiphos SDK installed in CI/CD docker
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/247
 - Sun Sensors have names denoting their location and poiting in the satellite now
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/245
 - Better RTD names denoting their purpose (and location consequently)

automation/Dockerfile

@@ -4,17 +4,24 @@ RUN apt-get update
 RUN apt-get --yes upgrade
 #tzdata is a dependency, won't install otherwise
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get --yes install cmake libgpiod-dev xz-utils nano curl git gcc g++ lcov valgrind libgps-dev
+RUN apt-get --yes install cmake libgpiod-dev xz-utils nano curl git gcc g++ lcov valgrind libgps-dev python3
 
-# Q7S root filesystem, required for cross-compilation.
-RUN mkdir -p /usr/rootfs; \
-curl https://buggy.irs.uni-stuttgart.de/eive/tools/eive-compile-rootfs-v0.1.0-7-gae69838.tar.xz \
-    | tar -xJ -C /usr/rootfs
+ARG XIPHOS_SDK_NAME=sdk-xiphos-eive-v0.2.0
+# Install Xiphos ARK SDK, which also installs Q7S root filesystem, required for cross-compilation.
+RUN curl https://buggy.irs.uni-stuttgart.de/eive/tools/${XIPHOS_SDK_NAME}.tar | tar -x && \
+    cd ${XIPHOS_SDK_NAME} && \
+    ./ark-glibc-x86_64-eive-image-cortexa9hf-neon-toolchain-nodistro.0.sh -y
 
 # Cross compiler
 RUN mkdir -p /usr/tools; \
 curl https://buggy.irs.uni-stuttgart.de/eive/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.gz \
     | tar -xz -C /usr/tools
 
-ENV ZYNQ_7020_SYSROOT="/usr/rootfs/eive-compile-rootfs"
+RUN git clone https://github.com/catchorg/Catch2.git && \
+    cd Catch2 && \
+    git checkout v3.0.0-preview5 && \
+    cmake -Bbuild -H. -DBUILD_TESTING=OFF && \
+    cmake --build build/ --target install
+
+ENV ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
 ENV PATH=$PATH:"/usr/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"

automation/Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
     }
     agent {
         docker {
-            image 'eive-obsw-ci:d4'
+            image 'eive-obsw-ci:d5'
             args '--sysctl fs.mqueue.msg_max=100'
         }
     }