Skip to content

Commit ccae987

Browse files
authored
Merge branch 'main' into fix-paths-after-glob
2 parents d49c454 + 990f15e commit ccae987

File tree

2,987 files changed

+90544
-65866
lines changed

Some content is hidden

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

2,987 files changed

+90544
-65866
lines changed

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ enabled:
9191
- src/platform/test/functional/apps/discover/context_awareness/config.ts
9292
- src/platform/test/functional/apps/discover/observability/config.ts
9393
- src/platform/test/functional/apps/discover/tabs/config.ts
94+
- src/platform/test/functional/apps/discover/tabs2/config.ts
9495
- src/platform/test/functional/apps/getting_started/config.ts
9596
- src/platform/test/functional/apps/home/config.ts
9697
- src/platform/test/functional/apps/kibana_overview/config.ts
@@ -402,7 +403,6 @@ enabled:
402403
- x-pack/platform/test/encrypted_saved_objects_api_integration/config.ts
403404
- x-pack/platform/test/fleet_multi_cluster/config.ts
404405
- x-pack/platform/test/monitoring_api_integration/config.ts
405-
- x-pack/platform/test/onechat_api_integration/configs/config.stateful.ts
406406
- x-pack/platform/test/plugin_api_integration/config.ts
407407
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_basic.ts
408408
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts

.buildkite/ftr_search_serverless_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ enabled:
2727
- x-pack/platform/test/serverless/functional/configs/search/config.group10.ts
2828
- x-pack/platform/test/serverless/functional/configs/search/config.group11.ts
2929
- x-pack/platform/test/serverless/functional/configs/search/config.group12.ts
30+
- x-pack/platform/test/onechat_api_integration/configs/config.serverless.ts
31+

.buildkite/ftr_search_stateful_configs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ enabled:
1212
- x-pack/solutions/search/test/functional_solution_sidenav/config.ts
1313
- x-pack/solutions/search/test/functional_solution_sidenav/config.nav_v2.ts
1414
- x-pack/solutions/search/test/accessibility/config.ts
15+
- x-pack/platform/test/onechat_api_integration/configs/config.stateful.ts

.buildkite/pipelines/es_snapshots/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ steps:
99
localSsds: 1
1010
localSsdInterface: nvme
1111
machineType: c2-standard-8
12+
diskSizeGb: 100

.buildkite/pipelines/flaky_tests/pipeline.ts

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ function getTestSuitesFromJson(json: string) {
8181
}
8282

8383
const type = item.type;
84-
if (type !== 'ftrConfig' && type !== 'group') {
85-
fail(`testSuite.type must be either "ftrConfig" or "group"`);
84+
if (type !== 'ftrConfig' && type !== 'scoutConfig' && type !== 'group') {
85+
fail(`testSuite.type must be either "ftrConfig" or "scoutConfig" or "group"`);
8686
}
8787

8888
if (item.type === 'ftrConfig') {
@@ -99,6 +99,20 @@ function getTestSuitesFromJson(json: string) {
9999
continue;
100100
}
101101

102+
if (item.type === 'scoutConfig') {
103+
const scoutConfig = item.scoutConfig;
104+
if (typeof scoutConfig !== 'string') {
105+
fail(`testSuite.scoutConfig must be a string`);
106+
}
107+
108+
testSuites.push({
109+
type: 'scoutConfig',
110+
scoutConfig,
111+
count,
112+
});
113+
continue;
114+
}
115+
102116
const key = item.key;
103117
if (typeof key !== 'string') {
104118
fail(`testSuite.key must be a string`);
@@ -192,7 +206,7 @@ for (const testSuite of testSuites) {
192206
concurrency_method: 'eager',
193207
agents: expandAgentQueue(usesParallelWorkers ? 'n2-8-spot' : 'n2-4-spot'),
194208
depends_on: 'build',
195-
timeout_in_minutes: 30,
209+
timeout_in_minutes: 60,
196210
cancel_on_build_failing: true,
197211
retry: {
198212
automatic: [{ exit_status: '-1', limit: 3 }],

.buildkite/scripts/steps/checks/quick_checks.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
.buildkite/scripts/steps/checks/validate_pipelines.sh
2323
.buildkite/scripts/steps/checks/check_scout_config.sh
2424
.buildkite/scripts/steps/checks/dependencies_diff.sh
25+
.buildkite/scripts/steps/checks/verify_codeowners.sh
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source .buildkite/scripts/common/util.sh
6+
7+
echo --- Verify CODEOWNERS
8+
9+
if is_pr && ! is_auto_commit_disabled && [[ "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "main" ]]; then
10+
node scripts/generate codeowners
11+
check_for_changed_files "node scripts/generate codeowners" true
12+
else
13+
echo "CODEOWNERS is only verified for PRs targeting main, skipping check."
14+
exit 0
15+
fi

.buildkite/scripts/steps/test/jest_parallel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ while read -r config; do
6666
cmd=$cmd" --enable-fips --openssl-config=$HOME/nodejs.cnf"
6767
fi
6868

69-
cmd=$cmd"\" node ./scripts/jest --config=\"$config\" $parallelism --coverage=false --passWithNoTests"
69+
cmd=$cmd"\" NODE_ENV=test node ./scripts/jest --config=\"$config\" $parallelism --coverage=false --passWithNoTests"
7070

7171
echo "actual full command is:"
7272
echo "$cmd"

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ snapshots.js
2323
/src/platform/plugins/shared/data/common/es_query/kuery/ast/_generated_/**
2424
/x-pack/platform/plugins/private/canvas/canvas_plugin
2525
/x-pack/platform/plugins/private/canvas/shareable_runtime/build
26-
/x-pack/platform/plugins/private/canvas/storybook/build
2726
/x-pack/platform/plugins/private/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
2827
/x-pack/platform/plugins/private/reporting/server/export_types/printable_pdf_v2/server/lib/pdf/assets/**
2928
/x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/public/assets/**

0 commit comments

Comments
 (0)