Skip to content

Commit 39549af

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-64395
2 parents af278d0 + 17367ef commit 39549af

2,004 files changed

Lines changed: 52333 additions & 36434 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.

‎.backportrc.json‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.4", "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"],
4-
"labels": ["backport"]
3+
"targetBranchChoices": [
4+
{ "name": "7.x", "checked": true },
5+
"7.9",
6+
"7.8",
7+
"7.7",
8+
"7.6",
9+
"7.5",
10+
"7.4",
11+
"7.3",
12+
"7.2",
13+
"7.1",
14+
"7.0",
15+
"6.8",
16+
"6.7",
17+
"6.6",
18+
"6.5",
19+
"6.4",
20+
"6.3",
21+
"6.2",
22+
"6.1",
23+
"6.0",
24+
"5.6"
25+
],
26+
"targetPRLabels": ["backport"],
27+
"branchLabelMapping": {
28+
"^v7.10.0$": "7.x",
29+
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
30+
}
531
}

‎.browserslistrc‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[production]
2-
last 2 versions
3-
> 5%
4-
Safari 7 # for PhantomJS support: https://github.com/elastic/kibana/issues/27136
2+
last 2 Firefox versions
3+
last 2 Chrome versions
4+
last 2 Safari versions
5+
> 0.25%
6+
not ie 11
57

68
[dev]
79
last 1 chrome versions

.ci/Jenkinsfile_visual_baseline renamed to .ci/Jenkinsfile_baseline_capture

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ kibanaPipeline(timeoutMinutes: 120) {
88
catchError {
99
parallel([
1010
'oss-visualRegression': {
11-
workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
11+
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
1212
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
1313
}
1414
},
1515
'xpack-visualRegression': {
16-
workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
16+
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
1717
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
1818
}
1919
},

‎.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+
}

‎.ci/pipeline-library/src/test/prChanges.groovy‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,17 @@ class PrChangesTest extends KibanaBasePipelineTest {
8484

8585
assertFalse(prChanges.areChangesSkippable())
8686
}
87+
88+
@Test
89+
void 'areChangesSkippable() with skippable changes that are in notSkippablePaths'() {
90+
props([
91+
githubPrs: [
92+
getChanges: { [
93+
[filename: 'docs/developer/architecture/code-exploration.asciidoc'],
94+
] },
95+
],
96+
])
97+
98+
assertFalse(prChanges.areChangesSkippable())
99+
}
87100
}

‎.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/*

0 commit comments

Comments
 (0)