dmoonfire/dosage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Jenkins: Remove timestamps & ansicolor wrapper

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Jenkinsfile vendored
View file

@ -71,8 +71,8 @@ pys.each { py ->
} }
} }
timestamps { // MAIN //
ansiColor('xterm') {
parallel(tasks) parallel(tasks)
stage('Windows binary') { stage('Windows binary') {
windowsBuild() windowsBuild()
@ -80,8 +80,6 @@ timestamps {
stage('Allure report') { stage('Allure report') {
processAllure() processAllure()
} }
}
}
def buildDockerfile(image) { def buildDockerfile(image) {
def uid = sh(returnStdout: true, script: 'id -u').trim() def uid = sh(returnStdout: true, script: 'id -u').trim()

6
tests/modules/Jenkinsfile vendored
View file

@ -42,7 +42,7 @@ def runTests() {
} }
} }
ansiColor('xterm') { // MAIN //
node { node {
def img = prepareDocker() def img = prepareDocker()
@ -55,7 +55,8 @@ ansiColor('xterm') {
} }
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,
projectName: JOB_NAME, selector: lastWithArtifacts()
if (fileExists('allure-history.zip')) { if (fileExists('allure-history.zip')) {
unzip dir: 'allure-data', quiet: true, zipFile: 'allure-history.zip' unzip dir: 'allure-data', quiet: true, zipFile: 'allure-history.zip'
sh 'rm -f allure-history.zip' sh 'rm -f allure-history.zip'
@ -65,5 +66,4 @@ ansiColor('xterm') {
publishHTML reportDir: 'allure-report', reportFiles: 'index.html', reportName: 'Allure Report' publishHTML reportDir: 'allure-report', reportFiles: 'index.html', reportName: 'Allure Report'
} }
} }
}