Skip to content

Commit cdfac8d

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into new-platform-browser
2 parents 1779f19 + 3b6e51b commit cdfac8d

1,969 files changed

Lines changed: 20261 additions & 10273 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_flaky‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
// Looks like 'oss:ciGroup:1' or 'oss:firefoxSmoke'
7-
def JOB_PARTS = params.CI_GROUP.split(':')
6+
def CI_GROUP_PARAM = params.CI_GROUP
7+
8+
// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke', or 'all:serverMocha'
9+
def JOB_PARTS = CI_GROUP_PARAM.split(':')
810
def IS_XPACK = JOB_PARTS[0] == 'xpack'
911
def JOB = JOB_PARTS[1]
12+
def NEED_BUILD = JOB != 'serverMocha'
1013
def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
1114
def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
1215
def AGENT_COUNT = getAgentCount(EXECUTIONS)
@@ -31,13 +34,15 @@ stage("Kibana Pipeline") {
3134
print "Agent ${agentNumberInside} - ${agentExecutions} executions"
3235

3336
kibanaPipeline.withWorkers('flaky-test-runner', {
34-
if (!IS_XPACK) {
35-
kibanaPipeline.buildOss()
36-
if (CI_GROUP == '1') {
37-
runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
37+
if (NEED_BUILD) {
38+
if (!IS_XPACK) {
39+
kibanaPipeline.buildOss()
40+
if (CI_GROUP == '1') {
41+
runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
42+
}
43+
} else {
44+
kibanaPipeline.buildXpack()
3845
}
39-
} else {
40-
kibanaPipeline.buildXpack()
4146
}
4247
}, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
4348
}
@@ -61,7 +66,17 @@ stage("Kibana Pipeline") {
6166

6267
def getWorkerFromParams(isXpack, job, ciGroup) {
6368
if (!isXpack) {
64-
if (job == 'firefoxSmoke') {
69+
if (job == 'serverMocha') {
70+
return kibanaPipeline.getPostBuildWorker('serverMocha', {
71+
kibanaPipeline.bash(
72+
"""
73+
source src/dev/ci_setup/setup_env.sh
74+
node scripts/mocha
75+
""",
76+
"run `node scripts/mocha`"
77+
)
78+
})
79+
} else if (job == 'firefoxSmoke') {
6580
return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') })
6681
} else if(job == 'visualRegression') {
6782
return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') })

‎.eslintrc.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ module.exports = {
6464
'jsx-a11y/no-onchange': 'off',
6565
},
6666
},
67-
{
68-
files: ['src/legacy/core_plugins/console/**/*.{js,ts,tsx}'],
69-
rules: {
70-
'react-hooks/exhaustive-deps': 'off',
71-
},
72-
},
7367
{
7468
files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
7569
rules: {

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@
4040
# ML team owns the transform plugin, ES team added here for visibility
4141
# because the plugin lives in Kibana's Elasticsearch management section.
4242
/x-pack/legacy/plugins/transform/ @elastic/ml-ui @elastic/es-ui
43+
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
44+
/x-pack/test/functional/services/transform_ui/ @elastic/ml-ui
45+
/x-pack/test/functional/services/transform.ts @elastic/ml-ui
4346

4447
# Operations
45-
/renovate.json5 @elastic/kibana-operations
4648
/src/dev/ @elastic/kibana-operations
4749
/src/setup_node_env/ @elastic/kibana-operations
4850
/src/optimize/ @elastic/kibana-operations
@@ -59,6 +61,7 @@
5961
/config/kibana.yml @elastic/kibana-platform
6062
/x-pack/plugins/features/ @elastic/kibana-platform
6163
/x-pack/plugins/licensing/ @elastic/kibana-platform
64+
/packages/kbn-config-schema/ @elastic/kibana-platform
6265

6366
# Security
6467
/x-pack/legacy/plugins/security/ @elastic/kibana-security

‎.i18nrc.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"embeddableApi": "src/plugins/embeddable",
99
"share": "src/plugins/share",
1010
"esUi": "src/plugins/es_ui_shared",
11+
"devTools": "src/plugins/dev_tools",
1112
"expressions": "src/plugins/expressions",
1213
"inputControl": "src/legacy/core_plugins/input_control_vis",
1314
"inspector": "src/plugins/inspector",

‎CONTRIBUTING.md‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,19 @@ Test runner arguments:
399399
- `[test path]` is the relative path to the test file.
400400

401401
Examples:
402-
- Run the entire elasticsearch_service test suite with yarn:
403-
`node scripts/jest src/core/server/elasticsearch/elasticsearch_service.test.ts`
404-
- Run the jest test case whose description matches 'stops both admin and data clients':
405-
`node scripts/jest -t 'stops both admin and data clients' src/core/server/elasticsearch/elasticsearch_service.test.ts`
402+
- Run the entire elasticsearch_service test suite:
403+
```
404+
node scripts/jest src/core/server/elasticsearch/elasticsearch_service.test.ts
405+
```
406+
- Run the jest test case whose description matches `stops both admin and data clients`:
407+
```
408+
node scripts/jest -t 'stops both admin and data clients' src/core/server/elasticsearch/elasticsearch_service.test.ts
409+
```
406410
- Run the api integration test case whose description matches the given string:
407-
`node scripts/functional_tests_server --config test/api_integration/config.js`
408-
`node scripts/functional_test_runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'`
411+
```
412+
node scripts/functional_tests_server --config test/api_integration/config.js
413+
node scripts/functional_test_runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'
414+
```
409415
410416
### Debugging Unit Tests
411417

0 commit comments

Comments
 (0)