From a3b102c0d0c83525f5c8d97bffa81c4bcdd30b06 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Oct 2023 11:07:49 +0200 Subject: [PATCH 1/8] this might work better --- automation/Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 94df71470..fa589e053 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -86,8 +86,9 @@ pipeline { } } stage('Documentation') { - when { - branch 'development' + anyOf { + branch 'development'; + branch pattern: 'development-doc*' } steps { sh 'pip install -r docs/requirements.txt' @@ -106,8 +107,9 @@ pipeline { } } stage('Master Documentation') { - when { - branch 'master' + anyOf { + branch 'master'; + branch pattern: 'master-doc*' } steps { sh 'pip install -r docs/requirements.txt' From cc97c7f82dc44583b1b9674107001a46d7024b14 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Oct 2023 11:10:49 +0200 Subject: [PATCH 2/8] next test --- automation/Dockerfile | 4 +++- automation/Jenkinsfile | 16 ++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index 9b96d7bf1..f1fa606c1 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -7,7 +7,9 @@ RUN apt-get --yes upgrade ARG DEBIAN_FRONTEND=noninteractive RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping python3 pip doxygen graphviz rsync -RUN python3 -m pip install sphinx breathe +# This should also install Sphinx +RUN python3 -m pip install -r docs/requirements.txt +RUN python3 -m pip install breathe RUN git clone https://github.com/catchorg/Catch2.git && \ cd Catch2 && \ diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index fa589e053..3ab084343 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -86,9 +86,11 @@ pipeline { } } stage('Documentation') { - anyOf { - branch 'development'; - branch pattern: 'development-doc*' + when { + anyOf { + branch 'development'; + branch pattern: 'development-doc*' + } } steps { sh 'pip install -r docs/requirements.txt' @@ -107,9 +109,11 @@ pipeline { } } stage('Master Documentation') { - anyOf { - branch 'master'; - branch pattern: 'master-doc*' + when { + anyOf { + branch 'master'; + branch pattern: 'master-doc*' + } } steps { sh 'pip install -r docs/requirements.txt' From c9281a376090de685a389eb023e488c972bea80e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Oct 2023 11:11:38 +0200 Subject: [PATCH 3/8] should be in docker now --- automation/Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 3ab084343..4fc485ffa 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -93,7 +93,6 @@ pipeline { } } steps { - sh 'pip install -r docs/requirements.txt' dir(DOCDDIR) { sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..' sh 'make Sphinx' @@ -116,7 +115,6 @@ pipeline { } } steps { - sh 'pip install -r docs/requirements.txt' dir(DOCDDIR) { sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..' sh 'make Sphinx' From f0e4eacac5e299c536a08a0a8788f924bdcf5152 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Oct 2023 11:30:19 +0200 Subject: [PATCH 4/8] this should work --- automation/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 4fc485ffa..32acb8f91 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -89,7 +89,7 @@ pipeline { when { anyOf { branch 'development'; - branch pattern: 'development-doc*' + branch pattern: 'development-doc-deplyment*' } } steps { @@ -111,7 +111,7 @@ pipeline { when { anyOf { branch 'master'; - branch pattern: 'master-doc*' + branch pattern: 'master-doc-deployment*' } } steps { From 622ad9ff187d75606249819ba6180d7bc441e8b5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Oct 2023 11:40:56 +0200 Subject: [PATCH 5/8] typo --- automation/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 32acb8f91..2a3148573 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -89,7 +89,7 @@ pipeline { when { anyOf { branch 'development'; - branch pattern: 'development-doc-deplyment*' + branch pattern: 'development-doc-deployment*' } } steps { From ac817f296bdaf7b98481cb361c475db226ccd2d0 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 25 Oct 2023 11:51:57 +0200 Subject: [PATCH 6/8] missing COPY in Dockerfile --- automation/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/Dockerfile b/automation/Dockerfile index f1fa606c1..93f3cfdb6 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -8,6 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping python3 pip doxygen graphviz rsync # This should also install Sphinx +COPY docs/requirements.txt . RUN python3 -m pip install -r docs/requirements.txt RUN python3 -m pip install breathe From 8c20417af9e167c5a438e0016a20bb50be18fa4e Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 25 Oct 2023 12:01:40 +0200 Subject: [PATCH 7/8] wrong path --- automation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index 93f3cfdb6..6015335e3 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping # This should also install Sphinx COPY docs/requirements.txt . -RUN python3 -m pip install -r docs/requirements.txt +RUN python3 -m pip install -r requirements.txt RUN python3 -m pip install breathe RUN git clone https://github.com/catchorg/Catch2.git && \ From 515c66a7806ea063b0aed629840ece1e8558f886 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 25 Oct 2023 12:16:32 +0200 Subject: [PATCH 8/8] switching to new docker image --- automation/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 2a3148573..3b3f550c7 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } agent { docker { - image 'fsfw-ci:d6' + image 'fsfw-ci:d11' args '--network host --sysctl fs.mqueue.msg_max=100' } }