Skip to content

Commit

Permalink
Revert "Disables Chromedriver version detection (#75984)" (#77489) (#…
Browse files Browse the repository at this point in the history
…77512)

This reverts commit 595dfdb023d472c9f0bbecdb4201947b76435f09.
  • Loading branch information
Tyler Smalley authored Sep 15, 2020
1 parent 20a9855 commit f8f5d09
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
6 changes: 0 additions & 6 deletions src/dev/ci_setup/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ 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
###
Expand Down
14 changes: 7 additions & 7 deletions src/dev/ci_setup/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f8f5d09

Please sign in to comment.