From a1deab353c0d1d32c037b09d04bbb50789224933 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 26 Aug 2020 17:17:55 -0700
Subject: [PATCH] Disables Chromedriver version detection (#75984) (#76043)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/dev/ci_setup/setup.sh     |  6 ++++++
 src/dev/ci_setup/setup_env.sh | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh
index aabc1e75b9025..3351170c29e01 100755
--- a/src/dev/ci_setup/setup.sh
+++ b/src/dev/ci_setup/setup.sh
@@ -16,6 +16,12 @@ echo " -- TEST_ES_SNAPSHOT_VERSION='$TEST_ES_SNAPSHOT_VERSION'"
 echo " -- installing node.js dependencies"
 yarn kbn bootstrap --prefer-offline
 
+###
+### ensure Chromedriver install hook is triggered
+### when modules are up-to-date
+###
+node node_modules/chromedriver/install.js
+
 ###
 ### Download es snapshots
 ###
diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
index 72ec73ad810e6..5757d72f99582 100644
--- a/src/dev/ci_setup/setup_env.sh
+++ b/src/dev/ci_setup/setup_env.sh
@@ -134,13 +134,13 @@ export CYPRESS_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudf
 export CHECKS_REPORTER_ACTIVE=false
 
 # This is mainly for release-manager builds, which run in an environment that doesn't have Chrome installed
-if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
-  echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"
-  export DETECT_CHROMEDRIVER_VERSION=true
-  export CHROMEDRIVER_FORCE_DOWNLOAD=true
-else
-  echo "Chrome not detected, installing default chromedriver binary for the package version"
-fi
+# if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
+#   echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"
+#   export DETECT_CHROMEDRIVER_VERSION=true
+#   export CHROMEDRIVER_FORCE_DOWNLOAD=true
+# else
+#   echo "Chrome not detected, installing default chromedriver binary for the package version"
+# fi
 
 ### only run on pr jobs for elastic/kibana, checks-reporter doesn't work for other repos
 if [[ "$ghprbPullId" && "$ghprbGhRepository" == 'elastic/kibana' ]] ; then