From cc582ce6bb8bbf847dd18d63f6deb0113074445b Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Fri, 19 Mar 2021 14:27:56 +0100
Subject: [PATCH] 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.
---
 Jenkinsfile               | 18 ++++++++----------
 tests/modules/Jenkinsfile | 36 ++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3bb16d592..572bc807f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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) {
diff --git a/tests/modules/Jenkinsfile b/tests/modules/Jenkinsfile
index 3fd32939a..c32521ddd 100644
--- a/tests/modules/Jenkinsfile
+++ b/tests/modules/Jenkinsfile
@@ -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'
     }
 }