Merge branch 'mohr/automation' into mohr/catch2
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit

This commit is contained in:
Uli 2022-02-17 18:32:53 +01:00
commit 62531a710f
3 changed files with 24 additions and 38 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; \

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'
}
} }
} }
} }

View File

@ -67,7 +67,9 @@ ReturnValue_t GPSHyperionLinuxController::initializeLocalDataPool(
localDataPoolMap.emplace(GpsHyperion::SATS_IN_USE, new PoolEntry<uint8_t>()); localDataPoolMap.emplace(GpsHyperion::SATS_IN_USE, new PoolEntry<uint8_t>());
localDataPoolMap.emplace(GpsHyperion::SATS_IN_VIEW, new PoolEntry<uint8_t>()); localDataPoolMap.emplace(GpsHyperion::SATS_IN_VIEW, new PoolEntry<uint8_t>());
localDataPoolMap.emplace(GpsHyperion::FIX_MODE, new PoolEntry<uint8_t>()); localDataPoolMap.emplace(GpsHyperion::FIX_MODE, new PoolEntry<uint8_t>());
#if OBSW_ENABLE_PERIODIC_HK == 1
poolManager.subscribeForPeriodicPacket(gpsSet.getSid(), true, 2.0, false); poolManager.subscribeForPeriodicPacket(gpsSet.getSid(), true, 2.0, false);
#endif
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
@ -160,7 +162,6 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
gpsSet.hours = timeOfDay.hour; gpsSet.hours = timeOfDay.hour;
gpsSet.minutes = timeOfDay.minute; gpsSet.minutes = timeOfDay.minute;
gpsSet.seconds = timeOfDay.second; gpsSet.seconds = timeOfDay.second;
debugHyperionGps = true;
if (debugHyperionGps) { if (debugHyperionGps) {
sif::info << "-- Hyperion GPS Data --" << std::endl; sif::info << "-- Hyperion GPS Data --" << std::endl;
time_t timeRaw = gps->fix.time.tv_sec; time_t timeRaw = gps->fix.time.tv_sec;