From 3ed1b6f9f1b0a7011e3b23ebcefb13dfbf3af26d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 4 Jul 2022 10:10:03 +0200 Subject: [PATCH] update jenkinsfile --- automation/Jenkinsfile | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 3d57ea0..0dd7329 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -1,28 +1,18 @@ pipeline { agent any environment { - BUILDDIR = 'build-Debug' + BUILDDIR = 'cmake-build-debug' + } + agent { + docker { image 'fsfw-ci:d2'} } stages { - stage('Create Docker') { - agent { - dockerfile { - dir 'automation' - additionalBuildArgs '--no-cache' - reuseNode true - } - } + stage('Clean') { steps { sh 'rm -rf $BUILDDIR' } } stage('Configure') { - agent { - dockerfile { - dir 'automation' - reuseNode true - } - } steps { dir(BUILDDIR) { sh 'cmake -DFSFW_OSAL=host ..' @@ -30,15 +20,9 @@ pipeline { } } stage('Build') { - agent { - dockerfile { - dir 'automation' - reuseNode true - } - } steps { dir(BUILDDIR) { - sh 'cmake --build . -j' + sh 'cmake --build . -j4' } } }