From 7a83289b3d4e62a20547c1652d850533756a5291 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Mon, 7 Feb 2022 16:48:41 +0100 Subject: [PATCH 1/3] using prebuild, static docker image --- automation/Jenkinsfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index dae2da2c..f76496d1 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -3,13 +3,7 @@ pipeline { BUILDDIR = 'build-tests' } agent { - dockerfile { - dir 'automation' - //force docker to redownload base image and rebuild all steps instead of caching them - //this way, we always get an up to date docker image one each build - additionalBuildArgs '--no-cache --pull' - reuseNode true - } + docker { image: fsfw-ci:d1} } stages { stage('Clean') { From 54f3d7bd2df092776d0e3ae2170428a18e7896b7 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Mon, 7 Feb 2022 16:49:42 +0100 Subject: [PATCH 2/3] Jenkinsfile typo --- automation/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index f76496d1..abd4532b 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { BUILDDIR = 'build-tests' } agent { - docker { image: fsfw-ci:d1} + docker { image: 'fsfw-ci:d1'} } stages { stage('Clean') { From 720813963090b28faa66a08b6e324aa99830e6ca Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Mon, 7 Feb 2022 16:50:59 +0100 Subject: [PATCH 3/3] Jenkinsfile another typo --- automation/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index abd4532b..3424f986 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { BUILDDIR = 'build-tests' } agent { - docker { image: 'fsfw-ci:d1'} + docker { image 'fsfw-ci:d1'} } stages { stage('Clean') {