Jenkins: Remove timestamps & ansicolor wrapper

Both plugins have an option to be applied globally nowadays, so we don't
need to add it to the Jenkinsfile.
This commit is contained in:
Tobias Gruetzmacher 2021-03-19 14:27:56 +01:00
parent 115bf04c0b
commit cc582ce6bb
2 changed files with 26 additions and 28 deletions

18
Jenkinsfile vendored
View file

@ -71,16 +71,14 @@ pys.each { py ->
}
}
timestamps {
ansiColor('xterm') {
parallel(tasks)
stage('Windows binary') {
windowsBuild()
}
stage('Allure report') {
processAllure()
}
}
// MAIN //
parallel(tasks)
stage('Windows binary') {
windowsBuild()
}
stage('Allure report') {
processAllure()
}
def buildDockerfile(image) {

View file

@ -42,28 +42,28 @@ def runTests() {
}
}
ansiColor('xterm') {
node {
def img = prepareDocker()
// MAIN //
node {
def img = prepareDocker()
stage('Checkout') {
checkout scm
}
stage('Checkout') {
checkout scm
}
img.inside {
runTests()
}
img.inside {
runTests()
}
stage('Allure Report') {
copyArtifacts filter: 'allure-history.zip', optional: true, projectName: JOB_NAME, selector: lastWithArtifacts()
if (fileExists('allure-history.zip')) {
unzip dir: 'allure-data', quiet: true, zipFile: 'allure-history.zip'
sh 'rm -f allure-history.zip'
}
sh 'docker run --rm -v $PWD:/work -u $(id -u) tobix/allure-cli generate allure-data'
zip archive: true, dir: 'allure-report', glob: 'history/**', zipFile: 'allure-history.zip'
publishHTML reportDir: 'allure-report', reportFiles: 'index.html', reportName: 'Allure Report'
stage('Allure Report') {
copyArtifacts filter: 'allure-history.zip', optional: true,
projectName: JOB_NAME, selector: lastWithArtifacts()
if (fileExists('allure-history.zip')) {
unzip dir: 'allure-data', quiet: true, zipFile: 'allure-history.zip'
sh 'rm -f allure-history.zip'
}
sh 'docker run --rm -v $PWD:/work -u $(id -u) tobix/allure-cli generate allure-data'
zip archive: true, dir: 'allure-report', glob: 'history/**', zipFile: 'allure-history.zip'
publishHTML reportDir: 'allure-report', reportFiles: 'index.html', reportName: 'Allure Report'
}
}