From bdbfa7b336f5a15312cf99b1ae3ab844bfdd581d Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 4 Mar 2020 08:16:50 -0700
Subject: [PATCH 1/2] replace Jenkinsfile temporarily

---
 Jenkinsfile | 55 ++++++++++++-----------------------------------------
 1 file changed, 12 insertions(+), 43 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 742aec1d4e7ab..4a1e0f7d74e07 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,50 +3,19 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-kibanaPipeline(timeoutMinutes: 135) {
-  githubPr.withDefaultPrComments {
-    catchError {
-      retryable.enable()
-      parallel([
-        'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
-        'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
-        'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
-          // 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
-          'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
-          'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
-          'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
-          'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
-          'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
-          'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
-          'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
-          'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
-          'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
-          'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
-          'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
-          'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
-          'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
-          // 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
-        ]),
-        'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
-          // 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
-          'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
-          'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
-          'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
-          'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
-          'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
-          'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
-          'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
-          'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
-          'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
-          'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
-          'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
-          'xpack-siemCypress': kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh'),
-          // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
-        ]),
-      ])
-    }
+kibanaPipeline(timeoutMinutes: 120) {
+  catchError {
+    parallel([
+      workers.base(name: 'oss-visualRegression', label: 'linux && immutable') {
+        kibanaPipeline.buildOss()
+        kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')
+      },
+      workers.base(name: 'xpack-visualRegression', label: 'linux && immutable') {
+        kibanaPipeline.buildXpack()
+        kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')
+      },
+    ])
   }
 
-  retryable.printFlakyFailures()
   kibanaPipeline.sendMail()
 }

From 3aeb1a9b8ac2db101829c9458a2815b9281e70d1 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 4 Mar 2020 10:48:17 -0700
Subject: [PATCH 2/2] log output from command that is mysteriously failing

---
 tasks/function_test_groups.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tasks/function_test_groups.js b/tasks/function_test_groups.js
index 7b7293dc9a037..2d09474287485 100644
--- a/tasks/function_test_groups.js
+++ b/tasks/function_test_groups.js
@@ -77,6 +77,8 @@ grunt.registerTask(
         'test/functional/config.js',
         '--test-stats',
       ]);
+
+      grunt.log.always(result.stdout);
       const stats = JSON.parse(result.stderr);
 
       if (stats.excludedTests.length > 0) {
@@ -94,6 +96,7 @@ grunt.registerTask(
 
       done();
     } catch (error) {
+      grunt.log.always(error.stack);
       grunt.fail.fatal(error.stack);
     }
   }