diff --git a/automation/Dockerfile b/automation/Dockerfile index 9b96d7bf1..6015335e3 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -7,7 +7,10 @@ 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 +COPY 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 && \ cd Catch2 && \ diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 94df71470..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' } } @@ -87,10 +87,12 @@ pipeline { } stage('Documentation') { when { - branch 'development' + anyOf { + branch 'development'; + branch pattern: 'development-doc-deployment*' + } } steps { - sh 'pip install -r docs/requirements.txt' dir(DOCDDIR) { sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..' sh 'make Sphinx' @@ -107,10 +109,12 @@ pipeline { } stage('Master Documentation') { when { - branch 'master' + anyOf { + branch 'master'; + branch pattern: 'master-doc-deployment*' + } } steps { - sh 'pip install -r docs/requirements.txt' dir(DOCDDIR) { sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..' sh 'make Sphinx'