Updated Dockerfile and Jenkinsfile

This commit is contained in:
Ulrich Mohr 2022-02-17 18:31:21 +01:00
parent 6ddd2e4759
commit 57280167a2
2 changed files with 22 additions and 37 deletions

View File

@ -2,7 +2,9 @@ FROM ubuntu:focal
RUN apt-get update RUN apt-get update
RUN apt-get --yes upgrade RUN apt-get --yes upgrade
RUN apt-get --yes install cmake libgpiod-dev xz-utils nano curl #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
# Q7S root filesystem, required for cross-compilation. # Q7S root filesystem, required for cross-compilation.
RUN mkdir -p /usr/rootfs; \ RUN mkdir -p /usr/rootfs; \
@ -15,4 +17,4 @@ curl https://buggy.irs.uni-stuttgart.de/eive/tools/gcc-arm-8.3-2019.03-x86_64-ar
| tar -xz -C /usr/tools | tar -xz -C /usr/tools
ENV Q7S_SYSROOT="/usr/rootfs/cortexa9hf-neon-xiphos-linux-gnueabi" ENV Q7S_SYSROOT="/usr/rootfs/cortexa9hf-neon-xiphos-linux-gnueabi"
ENV PATH=$PATH:"/usr/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin" ENV PATH=$PATH:"/usr/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"

View File

@ -1,51 +1,34 @@
pipeline { pipeline {
agent any environment {
BUILDDIR_Q7 = 'build_q7',
BUILDDIR_LINUX = 'build_linux'
}
agent {
docker { image 'eive-obsw:d2'}
}
stages { stages {
stage('Build Container') {
when {
anyOf {
changeset "automation/Dockerfile-q7s"
branch 'develop';
changelog 'cleanDocker'
}
}
steps {
sh 'docker build -t eive-fsw-build-q7s:gcc8 - < automation/Dockerfile-q7s'
}
}
stage('Clean') { stage('Clean') {
when {
anyOf {
changelog 'cleanCI'
changeset '*.cmake'
changeset 'CMakeLists.txt'
}
}
steps { steps {
sh 'rm -rf build-q7s-debug' sh 'rm -rf $BUILDDIR_Q7'
sh 'rm -rf $BUILDDIR_LINUX'
} }
} }
stage('Build Q7S') { stage('Build Q7S') {
agent {
docker {
image 'eive-fsw-build-q7s:gcc8'
reuseNode true
}
}
steps { steps {
dir('build-q7s-debug') { dir(BUILDDIR_Q7) {
sh 'cmake -DTGT_BSP="arm/q7s" -DCMAKE_BUILD_TYPE=Debug -DFSFW_OSAL=linux ..' sh 'cmake -DTGT_BSP="arm/q7s" -DCMAKE_BUILD_TYPE=Debug ..'
sh 'cmake --build . -j' sh 'cmake --build . -j'
} }
} }
} }
stage('Deploy') { stage('Unittests') {
when {
tag 'v*.*.*'
}
steps { steps {
sh 'echo Deploying' dir(BUILDDIR_LINUX) {
sh 'cmake ..'
//to be used when unittests are merged...
//sh 'cmake --build -t eive-unittests . -j'
//sh './eive-unittests'
}
} }
} }
} }