Updated Dockerfile and Jenkinsfile

automation/Dockerfile

@@ -2,7 +2,9 @@ FROM ubuntu:focal
 
 RUN apt-get update
 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.
 RUN mkdir -p /usr/rootfs; \

automation/Jenkinsfile

@@ -1,51 +1,34 @@
 pipeline {
-    agent any
+    environment {
+        BUILDDIR_Q7 = 'build_q7',
+        BUILDDIR_LINUX = 'build_linux'
+    }
+    agent {
+        docker { image 'eive-obsw:d2'}
+    }
     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') {
-            when {
-                anyOf {
-                    changelog 'cleanCI'
-                    changeset '*.cmake'
-                    changeset 'CMakeLists.txt'
-                }
-            }
             steps {
-                sh 'rm -rf build-q7s-debug'
+                sh 'rm -rf $BUILDDIR_Q7'
+                sh 'rm -rf $BUILDDIR_LINUX'
             }
         }
         stage('Build Q7S') {
-            agent {
-                docker {
-                    image 'eive-fsw-build-q7s:gcc8'
-                    reuseNode true
-                }
-            }
             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'
                 }
             }
         }
-        stage('Deploy') {
+        stage('Unittests') {
-            when {
-                tag 'v*.*.*'
-            }
             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'
+                }
             }
         }
     }