diff --git a/Jenkinsfile b/Jenkinsfile index f2ac28a47137873557ed70e4d9616b8d3419d8bc..c51bbc3f72dd079d79e001017259e6d2b6e95054 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,13 +54,6 @@ if (helper.isRelease(this)) { } } -builders['docs'] = { - node('docker') { - dir('ogs') { checkoutWithTags() } - load 'ogs/scripts/jenkins/docs.groovy' - } -} - if (helper.isOriginMaster(this)) { builders['coverage'] = { node('docker') { diff --git a/scripts/jenkins/docs.groovy b/scripts/jenkins/docs.groovy deleted file mode 100644 index c3129e1758e32f6fb5e5f70786e1640b625da7f9..0000000000000000000000000000000000000000 --- a/scripts/jenkins/docs.groovy +++ /dev/null @@ -1,43 +0,0 @@ -def defaultCMakeOptions = - '-DOGS_LIB_BOOST=System ' + - '-DOGS_LIB_VTK=System ' + - '-DDOCS_GENERATE_LOGFILE=ON' - -def configure = new ogs.configure() -def build = new ogs.build() -def post = new ogs.post() -def helper = new ogs.helper() - -def image = docker.image('ogs6/gcc-latex:latest') -image.pull() -image.inside() { - stage('Configure (Docs)') { - configure.linux(cmakeOptions: defaultCMakeOptions, script: this) - } - - stage('Generate (Docs)') { - build.linux(script: this, target: 'doc') - } -} - -stage('Reports (Docs)') { - publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true, - keepAll: true, reportDir: 'build/docs', reportFiles: 'index.html', - reportName: 'Doxygen']) - step([$class: 'WarningsPublisher', canResolveRelativePaths: false, - messagesPattern: """ - .*DOT_GRAPH_MAX_NODES. - .*potential recursive class relation.*""", - parserConfigurations: [[parserName: 'Doxygen', pattern: - 'build/DoxygenWarnings.log']], unstableTotalAll: '0']) -} - -if (helper.isOriginMaster(this)) { - stage('Deploy (Docs)') { - sshagent(credentials: ['www-data_jenkins']) { - sh 'rsync -a --delete --stats -e "ssh -o StrictHostKeyChecking=no"' + - ' build/docs/ www-data@jenkins.opengeosys.org:'+ - '/var/www/doxygen.opengeosys.org' - } - } -} diff --git a/scripts/jenkins/gcc.groovy b/scripts/jenkins/gcc.groovy index cc9c58f1ac6bcec1d471b573b2db3f1efdb43d4b..3fd345b0b4b46c6697ba1aba599603ebac73e487 100644 --- a/scripts/jenkins/gcc.groovy +++ b/scripts/jenkins/gcc.groovy @@ -76,11 +76,30 @@ image.inside(defaultDockerArgs) { keepDir: true, script: this ) - build.linux(script: this) + build.linux(script: this, target: 'package doc') } } stage('Post (Linux-Docker)') { post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml' + + publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true, + keepAll: true, reportDir: 'build/docs', reportFiles: 'index.html', + reportName: 'Doxygen']) + step([$class: 'WarningsPublisher', canResolveRelativePaths: false, + messagesPattern: """ + .*DOT_GRAPH_MAX_NODES. + .*potential recursive class relation.*""", + parserConfigurations: [[parserName: 'Doxygen', pattern: + 'build/DoxygenWarnings.log']], unstableTotalAll: '0']) + + if (helper.isOriginMaster(this)) { + sshagent(credentials: ['www-data_jenkins']) { + sh 'rsync -a --delete --stats -e "ssh -o StrictHostKeyChecking=no"' + + ' build/docs/ www-data@jenkins.opengeosys.org:'+ + '/var/www/doxygen.opengeosys.org' + } + } + post.cleanup() }