Skip to content

Commit 21dd531

Browse files
Merge branch '8.19' into backport/8.19/pr-247521
2 parents f930a6c + 0b6cacd commit 21dd531

319 files changed

Lines changed: 4419 additions & 3485 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.

.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ steps:
258258
provider: gcp
259259
enableNestedVirtualization: true
260260
machineType: n2-standard-4
261+
diskSizeGb: 105
261262
depends_on: build
262263
timeout_in_minutes: 60
263264
parallelism: 12

.buildkite/pipelines/on_merge.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ steps:
411411
provider: gcp
412412
enableNestedVirtualization: true
413413
machineType: n2-standard-4
414+
diskSizeGb: 105
414415
timeout_in_minutes: 75
415416
parallelism: 20
416417
retry:
@@ -426,6 +427,7 @@ steps:
426427
provider: gcp
427428
machineType: n2-standard-4
428429
preemptible: true
430+
diskSizeGb: 105
429431
timeout_in_minutes: 120
430432
parallelism: 3
431433
retry:

.buildkite/pipelines/pointer_compression.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ steps:
1313
automatic:
1414
- exit_status: '*'
1515
limit: 1
16+
- command: .buildkite/scripts/steps/store_cache.sh
17+
label: Store Cache for build
18+
timeout_in_minutes: 10
19+
id: store_cache
20+
soft_fail: true
21+
agents:
22+
machineType: n2-standard-2
23+
diskSizeGb: 95
24+
1625
- wait
1726

1827
- command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
@@ -396,6 +405,7 @@ steps:
396405
provider: gcp
397406
enableNestedVirtualization: true
398407
machineType: n2-standard-4
408+
diskSizeGb: 105
399409
depends_on:
400410
- build
401411
timeout_in_minutes: 60
@@ -413,6 +423,7 @@ steps:
413423
provider: gcp
414424
enableNestedVirtualization: true
415425
machineType: n2-standard-4
426+
diskSizeGb: 105
416427
depends_on:
417428
- build
418429
timeout_in_minutes: 60

.buildkite/pipelines/pull_request/build_project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
machineType: n2-standard-16
66
preemptible: true
77
diskSizeGb: 150
8-
timeout_in_minutes: 60
8+
timeout_in_minutes: 90
99
soft_fail: true
1010
retry:
1111
automatic:

.buildkite/pipelines/pull_request/deploy_project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steps:
66
machineType: n2-standard-16
77
preemptible: true
88
diskSizeGb: 150
9-
timeout_in_minutes: 60
9+
timeout_in_minutes: 90
1010
retry:
1111
automatic:
1212
- exit_status: '-1'

.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ steps:
44
agents:
55
enableNestedVirtualization: true
66
machineType: n2-standard-4
7+
diskSizeGb: 105
78
depends_on:
89
- build
910
- quick_checks

.buildkite/pipelines/serverless_deployment/build_pr_and_deploy_project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ steps:
6363
machineType: n2-standard-16
6464
preemptible: true
6565
diskSizeGb: 150
66-
timeout_in_minutes: 60
66+
timeout_in_minutes: 90
6767
retry:
6868
automatic:
6969
- exit_status: '-1'

.buildkite/scripts/steps/test/ftr_configs.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ while read -r config; do
7979
node node_modules/chromedriver/install.js --chromedriver-force-download
8080

8181
# set annotation on the build
82-
buildkite-agent annotate --style info --context chrome-beta "This build uses Google Chrome Beta @ ${CHROMEDRIVER_VERSION}"
82+
buildkite-agent annotate --style info --context chrome-beta """
83+
⚠️This build uses Google Chrome Beta
84+
Path: ${TEST_BROWSER_BINARY_PATH}
85+
Version: $($TEST_BROWSER_BINARY_PATH --version)
86+
Chromedriver version: ${CHROMEDRIVER_VERSION} / $(node node_modules/chromedriver/bin/chromedriver --version)
87+
"""
8388
fi
8489

8590
# prevent non-zero exit code from breaking the loop

.buildkite/scripts/steps/typecheck/check_types.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,4 @@ source .buildkite/scripts/common/util.sh
88

99
echo --- Check Types
1010

11-
if is_pr; then
12-
node scripts/type_check --with-archive
13-
else
14-
node scripts/type_check
15-
fi
11+
node scripts/type_check --with-archive

.eslintrc.js

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,30 +1802,6 @@ module.exports = {
18021802
'@kbn/telemetry/event_generating_elements_should_be_instrumented': 'warn',
18031803
},
18041804
},
1805-
/**
1806-
* Allows snake_case variables in the server, because that's how we return API properties
1807-
*/
1808-
{
1809-
files: ['x-pack/solutions/search/plugins/enterprise_search/server/**/*.{ts,tsx}'],
1810-
rules: {
1811-
'@typescript-eslint/naming-convention': [
1812-
'error',
1813-
{
1814-
selector: 'variable',
1815-
modifiers: ['destructured'],
1816-
format: null,
1817-
leadingUnderscore: 'allow',
1818-
trailingUnderscore: 'allow',
1819-
},
1820-
{
1821-
selector: 'variable',
1822-
format: ['camelCase', 'UPPER_CASE'],
1823-
leadingUnderscore: 'allow',
1824-
trailingUnderscore: 'allow',
1825-
},
1826-
],
1827-
},
1828-
},
18291805
{
18301806
// Source files only - allow `any` in test/mock files
18311807
files: ['x-pack/solutions/search/plugins/enterprise_search/**/*.{ts,tsx}'],
@@ -2383,6 +2359,7 @@ module.exports = {
23832359
],
23842360
rules: {
23852361
'@kbn/eslint/scout_no_describe_configure': 'error',
2362+
'@kbn/eslint/scout_max_one_describe': 'error',
23862363
'@kbn/eslint/scout_test_file_naming': 'error',
23872364
'@kbn/eslint/scout_require_api_client_in_api_test': 'error',
23882365
'@kbn/eslint/scout_no_es_archiver_in_parallel_tests': 'error',

0 commit comments

Comments
 (0)