Fix Jenkinsfile

This commit is contained in:
Filip Gralinski 2019-12-02 20:46:51 +01:00
parent 2e58b878a9
commit 693ac5eeed
4 changed files with 41 additions and 7 deletions

View File

@ -149,6 +149,6 @@ vcs.xml
/auto /auto
{{cookiecutter.thesis_surname}}.pdf {{cookiecutter.thesis_surname}}.pdf
{{cookiecutter.thesis_surname}}.zip {{cookiecutter.thesis_surname}}.zip
autozoil-log.txt autozoil.xml
stats.txt stats.txt
abstract.txt abstract.txt

View File

@ -5,26 +5,60 @@ pipeline {
stages { stages {
stage ('get-autozoil') { stage ('get-autozoil') {
steps {
checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'autozoil']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://gitlab.com/filipg/autozoil.git']]]) checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'autozoil']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://gitlab.com/filipg/autozoil.git']]])
} }
}
stage ('build-pdf') { stage ('build-pdf') {
steps {
sh """ sh """
bash build.sh bash build.sh
""" """
}
post { post {
always { always {
archiveArtifacts artifacts: '{{cookiecutter.thesis_surname}}.pdf', fingerprint: true archiveArtifacts artifacts: '{{cookiecutter.thesis_surname}}.pdf', fingerprint: true
archiveArtifacts artifacts: 'stats.txt', fingerprint: true
plot csvFileName: 'stats.txt',
csvSeries: [[
file: 'stats.txt',
exclusionValues: '',
displayTableFlag: false,
inclusionFlag: 'OFF',
url: '']],
group: 'Plot Group',
title: 'Plot Title',
style: 'line',
exclZero: false,
keepRecords: false,
logarithmic: false,
numBuilds: '',
useDescr: false,
yaxis: '',
yaxisMaximum: '',
yaxisMinimum: ''
} }
} }
} }
stage ('autozoil') { stage ('autozoil') {
steps {
sh """ sh """
AUTOZOIL_DIR=autozoil bash check.sh AUTOZOIL_DIR=autozoil bash check.sh
""" """
} }
post {
always {
archiveArtifacts artifacts: 'autozoil.xml', fingerprint: true
junit 'autozoil.xml'
}
}
}
} }
} }

View File

@ -15,7 +15,7 @@ AUTOZOIL_LOCALE={{cookiecutter.thesis_locale}}
CONTENT_TEX_SOURCES_WITH_DIR := $(addprefix $(CURRENT_DIR)/, $(CONTENT_TEX_SOURCES)) CONTENT_TEX_SOURCES_WITH_DIR := $(addprefix $(CURRENT_DIR)/, $(CONTENT_TEX_SOURCES))
SCOREFILES=$(shell perl extract-score-files.pl $(CONTENT_TEX_SOURCES)) SCOREFILES=$(shell perl extract-score-files.pl $(CONTENT_TEX_SOURCES))
clean_latex_stuff=rm -rf *.aux *.nav *.toc *.log *.out *.blg *.bbl autozoil-log.txt $(THESIS_ID).pdf $(THESIS_ID).zip clean_latex_stuff=rm -rf *.aux *.nav *.toc *.log *.out *.blg *.bbl autozoil.xml $(THESIS_ID).pdf $(THESIS_ID).zip
stats.txt: $(THESIS_ID).pdf helpers/stats.sh stats.txt: $(THESIS_ID).pdf helpers/stats.sh
bash helpers/stats.sh $< > $@ bash helpers/stats.sh $< > $@
@ -31,8 +31,8 @@ scores/%.txt:
mkdir -p scores mkdir -p scores
curl "https://gonito.net/api/txt/score/"$* -o $@ curl "https://gonito.net/api/txt/score/"$* -o $@
autozoil-log.txt: $(CONTENT_TEX_SOURCES) autozoil.xml: $(CONTENT_TEX_SOURCES)
cd $(AUTOZOIL_DIR) && set -o pipefail && ./autozoil --locale $(AUTOZOIL_LOCALE) $(CONTENT_TEX_SOURCES_WITH_DIR) --format xml --alt-log-file $(CURRENT_DIR)/$(THESIS_ID).log | tee $(CURRENT_DIR)/$@ cd $(AUTOZOIL_DIR) && set -o pipefail && ./autozoil --locale $(AUTOZOIL_LOCALE) $(CONTENT_TEX_SOURCES_WITH_DIR) --format xml --alt-log-file $(CURRENT_DIR)/$(THESIS_ID).log > $(CURRENT_DIR)/autozoil.xml
$(THESIS_ID).zip: $(THESIS_ID).zip:
$(clean_latex_stuff) $(clean_latex_stuff)

View File

@ -1,3 +1,3 @@
#!/bin/bash -xe #!/bin/bash -xe
make autozoil-log.txt make autozoil.xml