From e6af6200ae538268cde1da2e035b3cc737aabf59 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Thu, 19 Jan 2023 17:32:23 +0100 Subject: [PATCH] updating CI --- automation/Dockerfile | 8 ++++++-- automation/Jenkinsfile | 14 +++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index 1bd39b3fb..0404bde92 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get --yes upgrade #tzdata is a dependency, won't install otherwise ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping python3 pip doxygen graphviz rsync +RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping python3 pip doxygen graphviz rsync wget qemu-system-arm RUN python3 -m pip install sphinx breathe @@ -21,8 +21,12 @@ RUN git clone https://github.com/ETLCPP/etl.git && \ cmake -B build . && \ cmake --install build/ +RUN wget -qO- https://buggy.irs.uni-stuttgart.de/rtems_releases/rtems6-12.2.1.tar.bz2 | tar -xj -C /opt/ + +ENV PATH="$PATH:/opt/rtems/6/bin" + #ssh needs a valid user to work -RUN adduser --uid 114 jenkins +RUN adduser -q --uid 114 jenkins #add documentation server to known hosts RUN echo "|1|/LzCV4BuTmTb2wKnD146l9fTKgQ=|NJJtVjvWbtRt8OYqFgcYRnMQyVw= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 0768f2cc2..cdc0ec3f0 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -3,11 +3,12 @@ pipeline { BUILDDIR_HOST = 'cmake-build-tests-host' BUILDDIR_LINUX = 'cmake-build-tests-linux' BUILDDIR_FREERTOS = 'cmake-build-tests-freertos' + BUILDDIR_RTEMS = 'cmake-build-tests-rtems' DOCDDIR = 'cmake-build-documentation' } agent { docker { - image 'fsfw-ci:d6' + image 'fsfw-ci:d7' args '--network host --sysctl fs.mqueue.msg_max=100' } } @@ -48,6 +49,17 @@ pipeline { } } } + stage('rtems') { + steps { + sh 'rm -rf $BUILDDIR_RTEMS' + + dir(BUILDDIR_RTEMS) { + sh 'cmake -DFSFW_OSAL=rtems -DFSFW_BUILD_TESTS=ON -DFSFW_TESTS_GEN_COV=OFF -DFSFW_CICD_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake ..' + sh 'cmake --build . -j4' + sh 'qemu-system-aarch64 -no-reboot -nographic -serial mon:stdio -semihosting -machine virt,gic-version=3 -cpu cortex-a72 -m 4000 -kernel fsfw-tests' + } + } + } stage('Documentation') { when { branch 'development'