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:
parent
115bf04c0b
commit
cc582ce6bb
2 changed files with 26 additions and 28 deletions
18
Jenkinsfile
vendored
18
Jenkinsfile
vendored
|
@ -71,16 +71,14 @@ pys.each { py ->
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
timestamps {
|
// MAIN //
|
||||||
ansiColor('xterm') {
|
|
||||||
parallel(tasks)
|
parallel(tasks)
|
||||||
stage('Windows binary') {
|
stage('Windows binary') {
|
||||||
windowsBuild()
|
windowsBuild()
|
||||||
}
|
}
|
||||||
stage('Allure report') {
|
stage('Allure report') {
|
||||||
processAllure()
|
processAllure()
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def buildDockerfile(image) {
|
def buildDockerfile(image) {
|
||||||
|
|
36
tests/modules/Jenkinsfile
vendored
36
tests/modules/Jenkinsfile
vendored
|
@ -42,28 +42,28 @@ def runTests() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ansiColor('xterm') {
|
// MAIN //
|
||||||
node {
|
node {
|
||||||
def img = prepareDocker()
|
def img = prepareDocker()
|
||||||
|
|
||||||
stage('Checkout') {
|
stage('Checkout') {
|
||||||
checkout scm
|
checkout scm
|
||||||
}
|
}
|
||||||
|
|
||||||
img.inside {
|
img.inside {
|
||||||
runTests()
|
runTests()
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Allure Report') {
|
stage('Allure Report') {
|
||||||
copyArtifacts filter: 'allure-history.zip', optional: true, projectName: JOB_NAME, selector: lastWithArtifacts()
|
copyArtifacts filter: 'allure-history.zip', optional: true,
|
||||||
if (fileExists('allure-history.zip')) {
|
projectName: JOB_NAME, selector: lastWithArtifacts()
|
||||||
unzip dir: 'allure-data', quiet: true, zipFile: 'allure-history.zip'
|
if (fileExists('allure-history.zip')) {
|
||||||
sh 'rm -f 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'
|
|
||||||
}
|
}
|
||||||
|
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'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue