Skip to content
This repository has been archived by the owner on Mar 31, 2024. It is now read-only.

Commit

Permalink
Use kibana-ci-proxy-cache for chrome and gecko drivers (elastic#41581)
Browse files Browse the repository at this point in the history
* [ci] download chromedriver and geckodriver through a caching proxy

* restore chromedriver and geckodriver caching in bootstrap cache

# Conflicts:
#	.ci/packer_cache.sh
#	src/dev/ci_setup/setup.sh
  • Loading branch information
Spencer committed Jul 20, 2019
1 parent ec50f86 commit c6c0fd5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
1 change: 0 additions & 1 deletion .ci/packer_cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ tar -cf "$HOME/.kibana/bootstrap_cache/master.tar" \
x-pack/node_modules \
x-pack/plugins/*/node_modules \
x-pack/plugins/reporting/.chromium \
x-pack/plugins/reporting/.phantom \
test/plugin_functional/plugins/*/node_modules \
.es;
14 changes: 4 additions & 10 deletions src/dev/ci_setup/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ C_RESET='\033[0m' # Reset color
###
export FORCE_COLOR=1

### To run the test suite against a different version of Elasticsearch than
### the default, uncomment this line, and change the version.
# export ES_SNAPSHOT_VERSION=7.0.0

###
### check that we seem to be in a kibana project
###
Expand All @@ -33,7 +29,6 @@ fi

export KIBANA_DIR="$dir"
export XPACK_DIR="$KIBANA_DIR/x-pack"
export NODE_OPTIONS="--max_old_space_size=2048"

parentDir="$(cd "$KIBANA_DIR/.."; pwd)"
export PARENT_DIR="$parentDir"
Expand All @@ -44,8 +39,8 @@ export KIBANA_PKG_BRANCH="$kbnBranch"
echo " -- KIBANA_DIR='$KIBANA_DIR'"
echo " -- XPACK_DIR='$XPACK_DIR'"
echo " -- PARENT_DIR='$PARENT_DIR'"
echo " -- NODE_OPTIONS='$NODE_OPTIONS'"
echo " -- KIBANA_PKG_BRANCH='$KIBANA_PKG_BRANCH'"
echo " -- TEST_ES_SNAPSHOT_VERSION='$TEST_ES_SNAPSHOT_VERSION'"

###
### download node
Expand Down Expand Up @@ -95,7 +90,6 @@ fi
### "install" node into this shell
###
export PATH="$nodeBin:$PATH"
hash -r

###
### downloading yarn
Expand All @@ -113,10 +107,10 @@ yarn config set yarn-offline-mirror "$cacheDir/yarn-offline-cache"
###
yarnGlobalDir="$(yarn global bin)"
export PATH="$PATH:$yarnGlobalDir"
hash -r

# use a proxy to fetch geckodriver asset
export GECKODRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/geckodriver_cache"
# use a proxy to fetch chromedriver/geckodriver asset
export GECKODRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
export CHROMEDRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"

###
### install dependencies
Expand Down

0 comments on commit c6c0fd5

Please sign in to comment.