forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:elastic/kibana
# Conflicts: # src/core_plugins/timelion/server/series_functions/__tests__/color.js # src/core_plugins/timelion/server/series_functions/color.js
- Loading branch information
Showing
24,739 changed files
with
1,837,447 additions
and
653,844 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "upstream": "elastic/kibana", | ||
| "branches": [{ "name": "6.x", "checked": true }, "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"], | ||
| "branches": [{ "name": "7.x", "checked": true }, "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"], | ||
| "labels": ["backport"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| last 2 versions | ||
| > 5% | ||
| Safari 7 | ||
| Safari 7 # for PhantomJS support: https://github.com/elastic/kibana/issues/27136 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| JOB: | ||
| - kibana-intake | ||
| - x-pack-intake | ||
| - kibana-firefoxSmoke | ||
| - kibana-ciGroup1 | ||
| - kibana-ciGroup2 | ||
| - kibana-ciGroup3 | ||
| - kibana-ciGroup4 | ||
| - kibana-ciGroup5 | ||
| - kibana-ciGroup6 | ||
| - kibana-ciGroup7 | ||
| - kibana-ciGroup8 | ||
| - kibana-ciGroup9 | ||
| - kibana-ciGroup10 | ||
| - kibana-ciGroup11 | ||
| - kibana-ciGroup12 | ||
| - kibana-visualRegression | ||
|
|
||
| # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh | ||
| - x-pack-firefoxSmoke | ||
| - x-pack-ciGroup1 | ||
| - x-pack-ciGroup2 | ||
| - x-pack-ciGroup3 | ||
| - x-pack-ciGroup4 | ||
| - x-pack-ciGroup5 | ||
| - x-pack-ciGroup6 | ||
| - x-pack-ciGroup7 | ||
| - x-pack-ciGroup8 | ||
| - x-pack-ciGroup9 | ||
| - x-pack-ciGroup10 | ||
| - x-pack-visualRegression | ||
|
|
||
| # `~` is yaml for `null` | ||
| exclude: ~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
|
|
||
| branch="$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" | ||
|
|
||
| # run setup script that gives us node, yarn, and bootstraps the project | ||
| source src/dev/ci_setup/setup.sh; | ||
|
|
||
| # download es snapshots | ||
| node scripts/es snapshot --download-only; | ||
| node scripts/es snapshot --license=oss --download-only; | ||
|
|
||
| # download reporting browsers | ||
| (cd "x-pack" && yarn gulp prepare); | ||
|
|
||
| # cache the chromedriver archive | ||
| chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")" | ||
| chromedriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")" | ||
| if [ -z "$chromedriverDistVersion" ] || [ -z "$chromedriverPkgVersion" ]; then | ||
| echo "UNABLE TO DETERMINE CHROMEDRIVER VERSIONS" | ||
| exit 1 | ||
| fi | ||
| mkdir -p .chromedriver | ||
| curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip | ||
| echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion | ||
|
|
||
| # cache the geckodriver archive | ||
| geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")" | ||
| if [ -z "$geckodriverPkgVersion" ]; then | ||
| echo "UNABLE TO DETERMINE geckodriver VERSIONS" | ||
| exit 1 | ||
| fi | ||
| mkdir -p ".geckodriver" | ||
| cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz | ||
| echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion | ||
|
|
||
| # archive cacheable directories | ||
| mkdir -p "$HOME/.kibana/bootstrap_cache" | ||
| tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \ | ||
| node_modules \ | ||
| packages/*/node_modules \ | ||
| x-pack/node_modules \ | ||
| x-pack/legacy/plugins/*/node_modules \ | ||
| x-pack/legacy/plugins/reporting/.chromium \ | ||
| test/plugin_functional/plugins/*/node_modules \ | ||
| .es \ | ||
| .chromedriver \ | ||
| .geckodriver; | ||
|
|
||
| echo "created $HOME/.kibana/bootstrap_cache/$branch.tar" | ||
|
|
||
| if [ "$branch" == "master" ]; then | ||
| echo "Creating bootstrap cache for 7.x"; | ||
|
|
||
| git clone https://github.com/elastic/kibana.git --branch 7.x --depth 1 /tmp/kibana-7.x | ||
| (cd /tmp/kibana-7.x && ./.ci/packer_cache.sh); | ||
| rm -rf /tmp/kibana-7.x; | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
|
|
||
| # move to Kibana root | ||
| cd "$(dirname "$0")/.." | ||
|
|
||
| source src/dev/ci_setup/load_env_keys.sh | ||
| source src/dev/ci_setup/extract_bootstrap_cache.sh | ||
| source src/dev/ci_setup/setup.sh | ||
| source src/dev/ci_setup/checkout_sibling_es.sh | ||
|
|
||
| case "$JOB" in | ||
| kibana-intake) | ||
| ./test/scripts/jenkins_unit.sh | ||
| ;; | ||
| kibana-ciGroup*) | ||
| export CI_GROUP="${JOB##kibana-ciGroup}" | ||
| ./test/scripts/jenkins_ci_group.sh | ||
| ;; | ||
| kibana-visualRegression*) | ||
| ./test/scripts/jenkins_visual_regression.sh | ||
| ;; | ||
| kibana-firefoxSmoke*) | ||
| ./test/scripts/jenkins_firefox_smoke.sh | ||
| ;; | ||
| x-pack-intake) | ||
| ./test/scripts/jenkins_xpack.sh | ||
| ;; | ||
| x-pack-ciGroup*) | ||
| export CI_GROUP="${JOB##x-pack-ciGroup}" | ||
| ./test/scripts/jenkins_xpack_ci_group.sh | ||
| ;; | ||
| x-pack-visualRegression*) | ||
| ./test/scripts/jenkins_xpack_visual_regression.sh | ||
| ;; | ||
| x-pack-firefoxSmoke*) | ||
| ./test/scripts/jenkins_xpack_firefox_smoke.sh | ||
| ;; | ||
| *) | ||
| echo "JOB '$JOB' is not implemented." | ||
| exit 1 | ||
| ;; | ||
| esac |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.