Skip to content

Commit

Permalink
Disables Chromedriver version detection (#75984) (#76043)
Browse files Browse the repository at this point in the history
Signed-off-by: Tyler Smalley <[email protected]>
  • Loading branch information
Tyler Smalley authored Aug 27, 2020
1 parent 969eaef commit a1deab3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions src/dev/ci_setup/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
###
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 a1deab3

Please sign in to comment.