disable failed tests reporter in baseline job

elastic · Sep 17, 2020 · 7b9c16d · 7b9c16d
1 parent 220d4bc
commit 7b9c16d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.ci/Jenkinsfile_baseline_capture b/.ci/Jenkinsfile_baseline_capture
@@ -12,12 +12,12 @@ kibanaPipeline(timeoutMinutes: 120) {
         ]) {
           parallel([
             'oss-baseline': {
-              workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true) {
+              workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
                 kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
               }
             },
             'xpack-baseline': {
-              workers.ci(name: 'xpack-baseline', size: 's-highmem', ramDisk: true) {
+              workers.ci(name: 'xpack-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
                 kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
               }
             },

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -12,12 +12,12 @@ kibanaPipeline(timeoutMinutes: 120) {
         ]) {
           parallel([
             'oss-baseline': {
-              workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true) {
+              workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
                 kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
               }
             },
             'xpack-baseline': {
-              workers.ci(name: 'xpack-baseline', size: 's-highmem', ramDisk: true) {
+              workers.ci(name: 'xpack-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
                 kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
               }
             },

diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
@@ -1,4 +1,4 @@
-def withPostBuildReporting(Closure closure) {
+def withPostBuildReporting(Map params, Closure closure) {
   try {
     closure()
   } finally {
@@ -9,8 +9,10 @@ def withPostBuildReporting(Closure closure) {
       print ex
     }
 
-    catchErrors {
-      runErrorReporter([pwd()] + parallelWorkspaces)
+    if (params.runErrorReporter) {
+      catchErrors {
+        runErrorReporter([pwd()] + parallelWorkspaces)
+      }
     }
 
     catchErrors {

diff --git a/vars/workers.groovy b/vars/workers.groovy
@@ -118,11 +118,11 @@ def base(Map params, Closure closure) {
 
 // Worker for ci processes. Extends the base worker and adds GCS artifact upload, error reporting, junit processing
 def ci(Map params, Closure closure) {
-  def config = [ramDisk: true, bootstrapped: true] + params
+  def config = [ramDisk: true, bootstrapped: true, runErrorReporter: true] + params
 
   return base(config) {
     kibanaPipeline.withGcsArtifactUpload(config.name) {
-      kibanaPipeline.withPostBuildReporting {
+      kibanaPipeline.withPostBuildReporting(config) {
         closure()
       }
     }