From e075559c318bc3f4d9a2b1c2a1feb0e833a185d5 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Thu, 17 Sep 2020 19:40:15 -0700
Subject: [PATCH] remove visual aspects of baseline job (#77815)

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .ci/Jenkinsfile_baseline_capture                     | 12 ++++++------
 ...kins_visual_regression.sh => jenkins_baseline.sh} |  7 -------
 ...isual_regression.sh => jenkins_xpack_baseline.sh} | 11 -----------
 vars/kibanaPipeline.groovy                           |  8 +++++---
 vars/workers.groovy                                  |  4 ++--
 5 files changed, 13 insertions(+), 29 deletions(-)
 rename test/scripts/{jenkins_visual_regression.sh => jenkins_baseline.sh} (63%)
 rename test/scripts/{jenkins_xpack_visual_regression.sh => jenkins_xpack_baseline.sh} (64%)

diff --git a/.ci/Jenkinsfile_baseline_capture b/.ci/Jenkinsfile_baseline_capture
index 9a49c19b94df2..33ecfcd84fd3e 100644
--- a/.ci/Jenkinsfile_baseline_capture
+++ b/.ci/Jenkinsfile_baseline_capture
@@ -11,14 +11,14 @@ kibanaPipeline(timeoutMinutes: 120) {
           'CI_PARALLEL_PROCESS_NUMBER=1'
         ]) {
           parallel([
-            'oss-visualRegression': {
-              workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
-                kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')()
+            'oss-baseline': {
+              workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
+                kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
               }
             },
-            'xpack-visualRegression': {
-              workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
-                kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')()
+            'xpack-baseline': {
+              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/test/scripts/jenkins_visual_regression.sh b/test/scripts/jenkins_baseline.sh
similarity index 63%
rename from test/scripts/jenkins_visual_regression.sh
rename to test/scripts/jenkins_baseline.sh
index 17345d4301882..e679ac7f31bd1 100755
--- a/test/scripts/jenkins_visual_regression.sh
+++ b/test/scripts/jenkins_baseline.sh
@@ -9,10 +9,3 @@ linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
 installDir="$PARENT_DIR/install/kibana"
 mkdir -p "$installDir"
 tar -xzf "$linuxBuild" -C "$installDir" --strip=1
-
-echo " -> running visual regression tests from kibana directory"
-yarn percy exec -t 10000 -- -- \
-  node scripts/functional_tests \
-    --debug --bail \
-    --kibana-install-dir "$installDir" \
-    --config test/visual_regression/config.ts;
diff --git a/test/scripts/jenkins_xpack_visual_regression.sh b/test/scripts/jenkins_xpack_baseline.sh
similarity index 64%
rename from test/scripts/jenkins_xpack_visual_regression.sh
rename to test/scripts/jenkins_xpack_baseline.sh
index 55d4a524820c5..7577b6927d166 100755
--- a/test/scripts/jenkins_xpack_visual_regression.sh
+++ b/test/scripts/jenkins_xpack_baseline.sh
@@ -14,16 +14,5 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1
 mkdir -p "$WORKSPACE/kibana-build-xpack"
 cp -pR install/kibana/. $WORKSPACE/kibana-build-xpack/
 
-# cd "$KIBANA_DIR"
-# source "test/scripts/jenkins_xpack_page_load_metrics.sh"
-
 cd "$KIBANA_DIR"
 source "test/scripts/jenkins_xpack_saved_objects_field_metrics.sh"
-
-echo " -> running visual regression tests from x-pack directory"
-cd "$XPACK_DIR"
-yarn percy exec -t 10000 -- -- \
-  node scripts/functional_tests \
-    --debug --bail \
-    --kibana-install-dir "$installDir" \
-    --config test/visual_regression/config.ts;
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 33ecefa13e862..3b5f2f55cc4e6 100644
--- 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
index e582e996a78b5..b6ff5b27667dd 100644
--- 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()
       }
     }