[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.
This commit is contained in:
Jonathan Budzenski 2018-09-06 18:31:47 -05:00 committed by Tyler Smalley
parent 4d83cfde56
commit 03553dedbc
6 changed files with 12 additions and 9 deletions

View file

@ -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

View file

@ -60,6 +60,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
@ -165,7 +166,7 @@ module.exports = function (grunt) {
args: [
'scripts/functional_tests',
'--config', 'test/api_integration/config.js',
'--esFrom', 'source',
'--esFrom', esFrom,
'--bail',
'--debug',
],
@ -177,7 +178,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`,
@ -189,7 +190,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`,
@ -203,7 +204,7 @@ module.exports = function (grunt) {
args: [
'scripts/functional_tests',
'--config', 'test/functional/config.js',
'--esFrom', 'source',
'--esFrom', esFrom,
'--bail',
'--debug',
'--',
@ -216,7 +217,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`,

View file

@ -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=

View file

@ -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;

View file

@ -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;

View file

@ -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 ""