From 67fbabbd7c59b1729acb6ba23a4092f0869cabd2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 19 Apr 2022 18:18:07 +0200 Subject: [PATCH] update docker file and jenkins file --- automation/Dockerfile | 6 +++--- automation/Jenkinsfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index 63592c77..eb04389e 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -8,13 +8,13 @@ RUN apt-get --yes install cmake libgpiod-dev xz-utils nano curl git gcc g++ lcov # Q7S root filesystem, required for cross-compilation. RUN mkdir -p /usr/rootfs; \ -curl https://buggy.irs.uni-stuttgart.de/eive/tools/cortexa9hf-neon-xiphos-linux-gnueabi.tar.gz \ - | tar -xz -C /usr/rootfs +curl https://buggy.irs.uni-stuttgart.de/eive/tools/eive-compile-rootfs-*.tar.xz \ + | tar -xJ -C /usr/rootfs # 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/cortexa9hf-neon-xiphos-linux-gnueabi" +ENV ZYNQ_7020_SYSROOT="/usr/rootfs/eive-compile-rootfs" ENV PATH=$PATH:"/usr/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin" diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index ee50924a..f8b180a1 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { } agent { docker { - image 'eive-obsw-ci:d3' + image 'eive-obsw-ci:d4' args '--sysctl fs.mqueue.msg_max=100' } }