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
14
Jenkinsfile
vendored
14
Jenkinsfile
vendored
|
@ -71,16 +71,14 @@ pys.each { py ->
|
|||
}
|
||||
}
|
||||
|
||||
timestamps {
|
||||
ansiColor('xterm') {
|
||||
parallel(tasks)
|
||||
stage('Windows binary') {
|
||||
// MAIN //
|
||||
|
||||
parallel(tasks)
|
||||
stage('Windows binary') {
|
||||
windowsBuild()
|
||||
}
|
||||
stage('Allure report') {
|
||||
}
|
||||
stage('Allure report') {
|
||||
processAllure()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def buildDockerfile(image) {
|
||||
|
|
8
tests/modules/Jenkinsfile
vendored
8
tests/modules/Jenkinsfile
vendored
|
@ -42,8 +42,8 @@ def runTests() {
|
|||
}
|
||||
}
|
||||
|
||||
ansiColor('xterm') {
|
||||
node {
|
||||
// MAIN //
|
||||
node {
|
||||
def img = prepareDocker()
|
||||
|
||||
stage('Checkout') {
|
||||
|
@ -55,7 +55,8 @@ ansiColor('xterm') {
|
|||
}
|
||||
|
||||
stage('Allure Report') {
|
||||
copyArtifacts filter: 'allure-history.zip', optional: true, projectName: JOB_NAME, selector: lastWithArtifacts()
|
||||
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'
|
||||
|
@ -64,6 +65,5 @@ ansiColor('xterm') {
|
|||
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