Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[6.x] [ci] Run ES snapshot when possible (#22663) #22788

Merged
merged 1 commit into from Sep 7, 2018
Merged

[6.x] [ci] Run ES snapshot when possible (#22663) #22788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/dev/ci_setup/git_setup.sh
View file
Open in desktop
Expand Up @@ -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

Expand Down
11 changes: 6 additions & 5 deletions tasks/config/run.js
View file
Open in desktop
Expand Up @@ -63,6 +63,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
Expand Down Expand Up @@ -168,7 +169,7 @@ module.exports = function (grunt) {
args: [
'scripts/functional_tests',
'--config', 'test/api_integration/config.js',
'--esFrom', 'source',
'--esFrom', esFrom,
'--bail',
'--debug',
],
Expand All @@ -180,7 +181,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`,
Expand All @@ -192,7 +193,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`,
Expand All @@ -206,7 +207,7 @@ module.exports = function (grunt) {
args: [
'scripts/functional_tests',
'--config', 'test/functional/config.js',
'--esFrom', 'source',
'--esFrom', esFrom,
'--bail',
'--debug',
'--',
Expand All @@ -219,7 +220,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`,
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/jenkins_cloud.sh
View file
Open in desktop
Expand Up @@ -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=
Expand Down
1 change: 1 addition & 0 deletions test/scripts/jenkins_selenium.sh
View file
Open in desktop
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion test/scripts/jenkins_unit.sh
View file
Open in desktop
Expand Up @@ -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;
4 changes: 2 additions & 2 deletions test/scripts/jenkins_xpack.sh
View file
Open in desktop
Expand Up @@ -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 ""