-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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 into dev/url-drill…
…down # Conflicts: # x-pack/plugins/ui_actions_enhanced/public/drilldowns/index.ts
- Loading branch information
Showing
3,441 changed files
with
123,878 additions
and
52,792 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
|
|
||
| branch="$1" | ||
| checkoutDir="$(pwd)" | ||
|
|
||
| if [[ "$branch" != "master" ]]; then | ||
| checkoutDir="/tmp/kibana-$branch" | ||
| git clone https://github.com/elastic/kibana.git --branch "$branch" --depth 1 "$checkoutDir" | ||
| cd "$checkoutDir" | ||
| fi | ||
|
|
||
| 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 | ||
|
|
||
| echo "Creating bootstrap_cache archive" | ||
|
|
||
| # archive cacheable directories | ||
| mkdir -p "$HOME/.kibana/bootstrap_cache" | ||
| tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \ | ||
| x-pack/plugins/reporting/.chromium \ | ||
| .es \ | ||
| .chromedriver \ | ||
| .geckodriver; | ||
|
|
||
| echo "Adding node_modules" | ||
| # Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar | ||
| find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%" | ||
|
|
||
| echo "created $HOME/.kibana/bootstrap_cache/$branch.tar" | ||
|
|
||
| if [[ "$branch" != "master" ]]; then | ||
| rm --preserve-root -rf "$checkoutDir" | ||
| 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import org.junit.* | ||
| import static groovy.test.GroovyAssert.* | ||
|
|
||
| class BuildStateTest extends KibanaBasePipelineTest { | ||
| def buildState | ||
|
|
||
| @Before | ||
| void setUp() { | ||
| super.setUp() | ||
|
|
||
| buildState = loadScript("vars/buildState.groovy") | ||
| } | ||
|
|
||
| @Test | ||
| void 'get() returns existing data'() { | ||
| buildState.add('test', 1) | ||
| def actual = buildState.get('test') | ||
| assertEquals(1, actual) | ||
| } | ||
|
|
||
| @Test | ||
| void 'get() returns null for missing data'() { | ||
| def actual = buildState.get('missing_key') | ||
| assertEquals(null, actual) | ||
| } | ||
|
|
||
| @Test | ||
| void 'add() does not overwrite existing keys'() { | ||
| assertTrue(buildState.add('test', 1)) | ||
| assertFalse(buildState.add('test', 2)) | ||
|
|
||
| def actual = buildState.get('test') | ||
|
|
||
| assertEquals(1, actual) | ||
| } | ||
|
|
||
| @Test | ||
| void 'set() overwrites existing keys'() { | ||
| assertFalse(buildState.has('test')) | ||
| buildState.set('test', 1) | ||
| assertTrue(buildState.has('test')) | ||
| buildState.set('test', 2) | ||
|
|
||
| def actual = buildState.get('test') | ||
|
|
||
| assertEquals(2, actual) | ||
| } | ||
| } |
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,85 @@ | ||
| import org.junit.* | ||
| import static org.mockito.Mockito.*; | ||
|
|
||
| class GithubCommitStatusTest extends KibanaBasePipelineTest { | ||
| def githubCommitStatus | ||
| def githubApiMock | ||
| def buildStateMock | ||
|
|
||
| def EXPECTED_STATUS_URL = 'repos/elastic/kibana/statuses/COMMIT_HASH' | ||
| def EXPECTED_CONTEXT = 'kibana-ci' | ||
| def EXPECTED_BUILD_URL = 'http://jenkins.localhost:8080/job/elastic+kibana+master/1/' | ||
|
|
||
| interface BuildState { | ||
| Object get(String key) | ||
| } | ||
|
|
||
| interface GithubApi { | ||
| Object post(String url, Map data) | ||
| } | ||
|
|
||
| @Before | ||
| void setUp() { | ||
| super.setUp() | ||
|
|
||
| buildStateMock = mock(BuildState) | ||
| githubApiMock = mock(GithubApi) | ||
|
|
||
| when(buildStateMock.get('checkoutInfo')).thenReturn([ commit: 'COMMIT_HASH', ]) | ||
| when(githubApiMock.post(any(), any())).thenReturn(null) | ||
|
|
||
| props([ | ||
| buildState: buildStateMock, | ||
| githubApi: githubApiMock, | ||
| ]) | ||
|
|
||
| githubCommitStatus = loadScript("vars/githubCommitStatus.groovy") | ||
| } | ||
|
|
||
| void verifyStatusCreate(String state, String description) { | ||
| verify(githubApiMock).post( | ||
| EXPECTED_STATUS_URL, | ||
| [ | ||
| 'state': state, | ||
| 'description': description, | ||
| 'context': EXPECTED_CONTEXT, | ||
| 'target_url': EXPECTED_BUILD_URL, | ||
| ] | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| void 'onStart() should create a pending status'() { | ||
| githubCommitStatus.onStart() | ||
| verifyStatusCreate('pending', 'Build started.') | ||
| } | ||
|
|
||
| @Test | ||
| void 'onFinish() should create a success status'() { | ||
| githubCommitStatus.onFinish() | ||
| verifyStatusCreate('success', 'Build completed successfully.') | ||
| } | ||
|
|
||
| @Test | ||
| void 'onFinish() should create an error status for failed builds'() { | ||
| mockFailureBuild() | ||
| githubCommitStatus.onFinish() | ||
| verifyStatusCreate('error', 'Build failed.') | ||
| } | ||
|
|
||
| @Test | ||
| void 'onStart() should exit early for PRs'() { | ||
| prop('githubPr', [ isPr: { true } ]) | ||
|
|
||
| githubCommitStatus.onStart() | ||
| verifyZeroInteractions(githubApiMock) | ||
| } | ||
|
|
||
| @Test | ||
| void 'onFinish() should exit early for PRs'() { | ||
| prop('githubPr', [ isPr: { true } ]) | ||
|
|
||
| githubCommitStatus.onFinish() | ||
| verifyZeroInteractions(githubApiMock) | ||
| } | ||
| } |
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
Validating CODEOWNERS rules …
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| [ | ||
| { | ||
| "output": "src/plugins/telemetry/schema/legacy_oss_plugins.json", | ||
| "root": "src/legacy/core_plugins/", | ||
| "exclude": [ | ||
| "src/legacy/core_plugins/testbed", | ||
| "src/legacy/core_plugins/elasticsearch", | ||
| "src/legacy/core_plugins/tests_bundle" | ||
| ] | ||
| }, | ||
| { | ||
| "output": "src/plugins/telemetry/schema/oss_plugins.json", | ||
| "root": "src/plugins/", | ||
| "exclude": [ | ||
| "src/plugins/kibana_react/", | ||
| "src/plugins/testbed/", | ||
| "src/plugins/kibana_utils/", | ||
| "src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts", | ||
| "src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts", | ||
| "src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts", | ||
| "src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts", | ||
| "src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts" | ||
| ] | ||
| } | ||
| ] |
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.