Skip to content

Commit fe70433

Browse files
sebelgasebelga
committed
Merge remote-tracking branch 'upstream/master' into fix/form-lib-memoize
2 parents 923471f + 21156d6 commit fe70433

2,852 files changed

Lines changed: 83999 additions & 40028 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/Jenkinsfile_visual_baseline renamed to .ci/Jenkinsfile_baseline_capture

File renamed without changes.

‎.ci/Jenkinsfile_baseline_trigger‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#!/bin/groovy
2+
3+
def MAXIMUM_COMMITS_TO_CHECK = 10
4+
def MAXIMUM_COMMITS_TO_BUILD = 5
5+
6+
if (!params.branches_yaml) {
7+
error "'branches_yaml' parameter must be specified"
8+
}
9+
10+
def additionalBranches = []
11+
12+
def branches = readYaml(text: params.branches_yaml) + additionalBranches
13+
14+
library 'kibana-pipeline-library'
15+
kibanaLibrary.load()
16+
17+
withGithubCredentials {
18+
branches.each { branch ->
19+
stage(branch) {
20+
def commits = getCommits(branch, MAXIMUM_COMMITS_TO_CHECK, MAXIMUM_COMMITS_TO_BUILD)
21+
22+
commits.take(MAXIMUM_COMMITS_TO_BUILD).each { commit ->
23+
catchErrors {
24+
githubCommitStatus.create(commit, 'pending', 'Baseline started.', 'kibana-ci-baseline')
25+
26+
build(
27+
propagate: false,
28+
wait: false,
29+
job: 'elastic+kibana+baseline-capture',
30+
parameters: [
31+
string(name: 'branch_specifier', value: branch),
32+
string(name: 'commit', value: commit),
33+
]
34+
)
35+
}
36+
}
37+
}
38+
}
39+
}
40+
41+
def getCommits(String branch, maximumCommitsToCheck, maximumCommitsToBuild) {
42+
print "Getting latest commits for ${branch}..."
43+
def commits = githubApi.get("repos/elastic/kibana/commits?sha=${branch}").take(maximumCommitsToCheck).collect { it.sha }
44+
def commitsToBuild = []
45+
46+
for (commit in commits) {
47+
print "Getting statuses for ${commit}"
48+
def status = githubApi.get("repos/elastic/kibana/statuses/${commit}").find { it.context == 'kibana-ci-baseline' }
49+
print "Commit '${commit}' already built? ${status ? 'Yes' : 'No'}"
50+
51+
if (!status) {
52+
commitsToBuild << commit
53+
} else {
54+
// Stop at the first commit we find that's already been triggered
55+
break
56+
}
57+
58+
if (commitsToBuild.size() >= maximumCommitsToBuild) {
59+
break
60+
}
61+
}
62+
63+
return commitsToBuild.reverse() // We want the builds to trigger oldest-to-newest
64+
}

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ target
2626
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
2727
/src/plugins/vis_type_timelion/public/_generated_/**
2828
/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
29+
/src/plugins/timelion/public/webpackShims/jquery.flot.*
2930
/x-pack/legacy/plugins/**/__tests__/fixtures/**
3031
/x-pack/plugins/apm/e2e/**/snapshots.js
3132
/x-pack/plugins/apm/e2e/tmp/*

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ disabledPlugins
3131
webpackstats.json
3232
/config/*
3333
!/config/kibana.yml
34+
!/config/node.options
3435
coverage
3536
selenium
3637
.babel_register_cache.json

‎.i18nrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"src/plugins/telemetry_management_section"
4545
],
4646
"tileMap": "src/plugins/tile_map",
47-
"timelion": ["src/legacy/core_plugins/timelion", "src/plugins/vis_type_timelion"],
47+
"timelion": ["src/plugins/timelion", "src/plugins/vis_type_timelion"],
4848
"uiActions": "src/plugins/ui_actions",
4949
"visDefaultEditor": "src/plugins/vis_default_editor",
5050
"visTypeMarkdown": "src/plugins/vis_type_markdown",

‎.sass-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
files:
22
include:
33
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
4-
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
4+
- 'src/plugins/timelion/**/*.s+(a|c)ss'
55
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
66
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
77
- 'x-pack/plugins/canvas/**/*.s+(a|c)ss'

0 commit comments

Comments
 (0)