From af79ba68e6cd64f87620abd6500db2c23d95a98d Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jbudz@users.noreply.github.com>
Date: Thu, 6 Sep 2018 18:31:47 -0500
Subject: [PATCH] [ci] Run ES snapshot when possible (#22663)

For instances where we would otherwise be running from source in a tracked elastic/elasticsearch branch, let's use a snapshot instead. This will eliminate some gradle issues we are experiencing in master.
---
 src/dev/ci_setup/git_setup.sh    |  1 +
 tasks/config/run.js              | 11 ++++++-----
 test/scripts/jenkins_cloud.sh    |  2 +-
 test/scripts/jenkins_selenium.sh |  1 +
 test/scripts/jenkins_unit.sh     |  2 +-
 test/scripts/jenkins_xpack.sh    |  4 ++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/dev/ci_setup/git_setup.sh b/src/dev/ci_setup/git_setup.sh
index b5e6902e2f2589..d0e2f3ffd87e4c 100755
--- a/src/dev/ci_setup/git_setup.sh
+++ b/src/dev/ci_setup/git_setup.sh
@@ -70,6 +70,7 @@ function checkout_sibling {
 
       cloneBranch="$PR_TARGET_BRANCH"
       if clone_target_is_valid ; then
+        export TEST_ES_FROM=snapshot
         return 0
       fi
 
diff --git a/tasks/config/run.js b/tasks/config/run.js
index daaf3f378a863f..bab934dbe38f91 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -63,6 +63,7 @@ module.exports = function (grunt) {
     '--server.port=5610',
   ];
 
+  const esFrom = process.env.TEST_ES_FROM || 'source';
   return {
     // used by the test and jenkins:unit tasks
     //    runs the eslint script to check for linting errors
@@ -168,7 +169,7 @@ module.exports = function (grunt) {
       args: [
         'scripts/functional_tests',
         '--config', 'test/api_integration/config.js',
-        '--esFrom', 'source',
+        '--esFrom', esFrom,
         '--bail',
         '--debug',
       ],
@@ -180,7 +181,7 @@ module.exports = function (grunt) {
         'scripts/functional_tests',
         '--config', 'test/server_integration/http/ssl/config.js',
         '--config', 'test/server_integration/http/ssl_redirect/config.js',
-        '--esFrom', 'source',
+        '--esFrom', esFrom,
         '--bail',
         '--debug',
         '--kibana-install-dir', `./build/oss/kibana-${PKG_VERSION}-${process.platform}-x86_64`,
@@ -192,7 +193,7 @@ module.exports = function (grunt) {
       args: [
         'scripts/functional_tests',
         '--config', 'test/plugin_functional/config.js',
-        '--esFrom', 'source',
+        '--esFrom', esFrom,
         '--bail',
         '--debug',
         '--kibana-install-dir', `./build/oss/kibana-${PKG_VERSION}-${process.platform}-x86_64`,
@@ -206,7 +207,7 @@ module.exports = function (grunt) {
       args: [
         'scripts/functional_tests',
         '--config', 'test/functional/config.js',
-        '--esFrom', 'source',
+        '--esFrom', esFrom,
         '--bail',
         '--debug',
         '--',
@@ -219,7 +220,7 @@ module.exports = function (grunt) {
       args: [
         'scripts/functional_tests',
         '--config', 'test/functional/config.js',
-        '--esFrom', 'source',
+        '--esFrom', esFrom,
         '--bail',
         '--debug',
         '--kibana-install-dir', `./build/oss/kibana-${PKG_VERSION}-${process.platform}-x86_64`,
diff --git a/test/scripts/jenkins_cloud.sh b/test/scripts/jenkins_cloud.sh
index 1020fbe9242904..25f683661232b6 100755
--- a/test/scripts/jenkins_cloud.sh
+++ b/test/scripts/jenkins_cloud.sh
@@ -4,7 +4,7 @@
 #
 # The cloud instance setup is done in the elastic/elastic-stack-testing framework,
 # where the following environment variables are set pointing to the cloud instance.
-# 
+#
 # export TEST_KIBANA_HOSTNAME
 # export TEST_KIBANA_PROTOCOL=
 # export TEST_KIBANA_PORT=
diff --git a/test/scripts/jenkins_selenium.sh b/test/scripts/jenkins_selenium.sh
index 7d6b26a59c485c..e95be0073fe631 100755
--- a/test/scripts/jenkins_selenium.sh
+++ b/test/scripts/jenkins_selenium.sh
@@ -7,4 +7,5 @@ source "$(dirname $0)/../../src/dev/ci_setup/java_setup.sh"
 
 node scripts/build --release --debug --oss;
 
+export TEST_ES_FROM=${TEST_ES_FROM:-source}
 xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:selenium --from=source;
diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
index 0ce41c45110fdb..4364facc45224e 100755
--- a/test/scripts/jenkins_unit.sh
+++ b/test/scripts/jenkins_unit.sh
@@ -5,5 +5,5 @@ source "$(dirname $0)/../../src/dev/ci_setup/setup.sh"
 source "$(dirname $0)/../../src/dev/ci_setup/git_setup.sh"
 source "$(dirname $0)/../../src/dev/ci_setup/java_setup.sh"
 
-export TEST_ES_FROM=source
+export TEST_ES_FROM=${TEST_ES_FROM:-source}
 xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --from=source;
diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
index b1837d03c8522f..6172db83a5de59 100755
--- a/test/scripts/jenkins_xpack.sh
+++ b/test/scripts/jenkins_xpack.sh
@@ -34,9 +34,9 @@ installDir="$PARENT_DIR/install/kibana"
 mkdir -p "$installDir"
 tar -xzf "$linuxBuild" -C "$installDir" --strip=1
 
-
+export TEST_ES_FROM=${TEST_ES_FROM:-source}
 echo " -> Running functional and api tests"
 cd "$XPACK_DIR"
-xvfb-run node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --esFrom=source
+xvfb-run node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir"
 echo ""
 echo ""