Skip to content

Commit d997565

Browse files
authored
Merge branch 'main' into copilot/fix-eslint-violations-icon-accessibility
2 parents cbd1e56 + 3885e91 commit d997565

2,043 files changed

Lines changed: 76537 additions & 43914 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.

.agents/skills/scout-api-testing/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Tests then import `apiTest` from the local fixtures: `import { apiTest } from '.
9494
- Use either `--config` or `--testFiles` (they are mutually exclusive).
9595
- Run by config: `node scripts/scout.js run-tests --arch stateful --domain classic --config <module-root>/test/scout*/api/playwright.config.ts` (or `.../api/parallel.playwright.config.ts` for parallel API runs)
9696
- Run by file/dir (Scout derives the right `playwright.config.ts` vs `parallel.playwright.config.ts`): `node scripts/scout.js run-tests --arch stateful --domain classic --testFiles <module-root>/test/scout*/api/tests/my.spec.ts`
97-
- For faster iteration, start servers once in another terminal: `node scripts/scout.js start-server --arch stateful --domain classic [--serverConfigSet <configSet>]`, then run Playwright directly: `npx playwright test --config <...> --project local --grep <tag>`.
97+
- For faster iteration, start servers once in another terminal: `node scripts/scout.js start-server --arch stateful --domain classic [--serverConfigSet <configSet>]`, then run Playwright directly: `node scripts/playwright test --config <...> --project local --grep <tag>`.
9898
- `run-tests` auto-detects custom config sets from `.../test/scout_<name>/...` paths.
9999
- `start-server` has no Playwright config to inspect, so pass `--serverConfigSet <name>` when your tests require a custom config set.
100100
- Debug: `SCOUT_LOG_LEVEL=debug`

.agents/skills/scout-migrate-from-ftr/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Once execution is complete, run the new Scout tests and fix failures until they
6464
For faster feedback during the loop, start the test servers once and reuse them across iterations:
6565

6666
1. Start servers (one-time): `node scripts/scout.js start-server --stateful --serverConfigSet <configSet>` (or `--serverless <project>`).
67-
2. Run the specs per iteration: `npx playwright test --config <playwright.config.ts> <test-file>`.
67+
2. Run the specs per iteration: `node scripts/playwright test --config <playwright.config.ts> <test-file>`.
6868

6969
Falling back to `node scripts/scout.js run-tests` works but restarts the servers each time, which is much slower for iterative debugging.
7070

.agents/skills/scout-ui-testing/SKILL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ test('creates and verifies a dashboard', async ({ pageObjects, page }) => {
113113
- Use either `--config` or `--testFiles` (they are mutually exclusive).
114114
- Run by config: `node scripts/scout.js run-tests --arch stateful --domain classic --config <module-root>/test/scout*/ui/playwright.config.ts` (or `.../ui/parallel.playwright.config.ts` for parallel UI)
115115
- Run by file/dir (Scout derives the right `playwright.config.ts` vs `parallel.playwright.config.ts`): `node scripts/scout.js run-tests --arch stateful --domain classic --testFiles <module-root>/test/scout*/ui/tests/my.spec.ts`
116-
- For faster iteration, start servers once in another terminal: `node scripts/scout.js start-server --arch stateful --domain classic [--serverConfigSet <configSet>]`, then run Playwright directly: `npx playwright test --config <...> --project local --grep <tag> --headed`.
116+
- For faster iteration, start servers once in another terminal: `node scripts/scout.js start-server --arch stateful --domain classic [--serverConfigSet <configSet>]`, then run Playwright directly: `node scripts/playwright test --config <...> --project local --grep <tag> --headed`.
117117
- `run-tests` auto-detects custom config sets from `.../test/scout_<name>/...` paths.
118118
- `start-server` has no Playwright config to inspect, so pass `--serverConfigSet <name>` when your tests require a custom config set.
119-
- Debug: `SCOUT_LOG_LEVEL=debug`, or `npx playwright test --config <...> --project local --ui`
119+
- Debug: `SCOUT_LOG_LEVEL=debug`, or `node scripts/playwright test --config <...> --project local --ui`
120120

121121
## CI enablement
122122

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
# VectorDB project FTR configs.
2-
# Placeholder — fill in once vectordb-specific FTR configs exist.
3-
# Reference: ftr_workplace_ai_serverless_configs.yml
4-
disabled: []
1+
disabled:
2+
# Base config files, only necessary to inform config finding script
3+
- x-pack/platform/test/serverless/functional/config.vectordb.base.ts
4+
5+
# Empty configs
6+
- x-pack/solutions/vectordb/test/serverless/functional/configs/config.feature_flags.ts
7+
- x-pack/solutions/vectordb/test/serverless/api_integration/configs/config.feature_flags.ts
8+
59
defaultQueue: 'n2-4-spot'
6-
enabled: []
10+
enabled:
11+
- x-pack/solutions/vectordb/test/serverless/api_integration/configs/config.ts
12+
- x-pack/platform/test/serverless/api_integration/configs/vectordb/config.group1.ts
13+
- x-pack/solutions/vectordb/test/serverless/functional/configs/config.ts
14+
- x-pack/platform/test/serverless/functional/configs/vectordb/config.config_compat_mode.ts
15+
- x-pack/platform/test/serverless/functional/configs/vectordb/config.group1.ts

.buildkite/pipeline-resource-definitions/kibana-version-bump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ spec:
4242
access_level: BUILD_AND_READ
4343
everyone:
4444
access_level: READ_ONLY
45-
release-eng:
45+
artifact-management:
4646
access_level: BUILD_AND_READ

.buildkite/pipeline-utils/scout/test_distribution_strategies.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ async function distributeScoutTestsOnLanes() {
5858
}
5959

6060
const steps: BuildkiteCommandStep[] = [];
61-
const loadIDsByStepKey: Record<string, string[]> = {};
61+
const loadInfoByStepKey: Record<string, { label: string; loadIDs: string[] }> = {};
6262
const testLaneLoadsFilePath = path.relative(getKibanaDir(), SCOUT_TEST_LANE_LOADS_PATH);
6363

6464
testTracksDefinitionPaths
@@ -72,8 +72,6 @@ async function distributeScoutTestsOnLanes() {
7272
// Define the effective lane number. `lane.number` is only accurate in reference to the originating test track
7373
const effectiveLaneNumber = steps.length + 1;
7474

75-
const stepKey = `scout_test_lane_${effectiveLaneNumber}`;
76-
7775
const laneEnv = {
7876
SCOUT_TEST_LANE_LOADS_PATH: testLaneLoadsFilePath,
7977
SCOUT_TEST_LANE_NUMBER: `${effectiveLaneNumber}`,
@@ -91,10 +89,13 @@ async function distributeScoutTestsOnLanes() {
9189
...collectEnvFromLabels(),
9290
};
9391

92+
const stepKey = `scout_test_lane_${effectiveLaneNumber}`;
93+
const stepLabel = `Scout Lane #${effectiveLaneNumber} - ${testTarget.arch}-${testTarget.domain} / ${server.configSet}`;
94+
9495
// Agent that will do the actual work of running the test loads
9596
steps.push({
96-
key: `scout_test_lane_${effectiveLaneNumber}`,
97-
label: `Scout Lane #${effectiveLaneNumber} - ${testTarget.arch}-${testTarget.domain} / ${server.configSet}`,
97+
key: stepKey,
98+
label: stepLabel,
9899
command: '.buildkite/scripts/steps/test/scout/run_test_lane.sh',
99100
timeout_in_minutes: 60,
100101
agents: expandAgentQueue(lane.metadata.buildkite.agentQueue),
@@ -107,8 +108,8 @@ async function distributeScoutTestsOnLanes() {
107108
},
108109
});
109110

110-
// Lane load IDs to be referenced by the agent
111-
loadIDsByStepKey[stepKey] = lane.loads;
111+
// Lane load information to be referenced by the agent (IDs in particular)
112+
loadInfoByStepKey[stepKey] = { label: stepLabel, loadIDs: lane.loads };
112113
});
113114

114115
if (steps.length === 0) {
@@ -138,7 +139,7 @@ async function distributeScoutTestsOnLanes() {
138139
);
139140

140141
// Write the test lane load IDs to disk in preparation of uploading as an artifact
141-
fs.writeFileSync(testLaneLoadsFilePath, JSON.stringify(loadIDsByStepKey));
142+
fs.writeFileSync(testLaneLoadsFilePath, JSON.stringify(loadInfoByStepKey));
142143
bk.uploadArtifacts(testLaneLoadsFilePath);
143144

144145
// Send it 🚀

.buildkite/pipelines/pull_request/post_build.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,15 @@ steps:
55
- command: .buildkite/scripts/lifecycle/post_build.sh
66
label: Post-Build
77
agents:
8-
machineType: n2-standard-2
8+
provider: k8s
9+
image: docker.elastic.co/ci-agent-images/kibana/ci-minimal
10+
imageUID: 1000
11+
plugins:
12+
- sparse-checkout#v1.6.0:
13+
paths:
14+
- .buildkite
15+
- .node-version
16+
- package.json
17+
- tsconfig.base.json
18+
- versions.json
19+
cleanup_sparse_state: true

.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_ai4dsoc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ steps:
1515
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
1616
timeout_in_minutes: 300
1717
parallelism: 1
18+
soft_fail:
19+
- exit_status: 101
1820

1921
- group: "API MKI - AI4DSOC"
2022
key: api_test_ai4dsoc
@@ -32,6 +34,8 @@ steps:
3234
automatic:
3335
- exit_status: "1"
3436
limit: 2
37+
soft_fail:
38+
- exit_status: 101
3539

3640
- label: Running ai4dsoc_nlp_cleanup_task:qa:serverless
3741
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh ai4dsoc_nlp_cleanup_task:qa:serverless
@@ -46,3 +50,5 @@ steps:
4650
automatic:
4751
- exit_status: "1"
4852
limit: 2
53+
soft_fail:
54+
- exit_status: 101

.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_defend_workflows.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ steps:
1414
diskSizeGb: 120
1515
timeout_in_minutes: 300
1616
parallelism: 5
17+
soft_fail:
18+
- exit_status: 101
1719

1820
- group: "Osquery MKI - Defend Workflows"
1921
key: cypress_test_osquery_defend_workflows
@@ -30,6 +32,8 @@ steps:
3032
diskSizeGb: 120
3133
timeout_in_minutes: 300
3234
parallelism: 3
35+
soft_fail:
36+
- exit_status: 101
3337

3438
- group: "API MKI - Defend Workflows"
3539
key: api_test_defend_workflows
@@ -108,6 +112,8 @@ steps:
108112
automatic:
109113
- exit_status: "1"
110114
limit: 1
115+
soft_fail:
116+
- exit_status: 101
111117

112118
- label: "API MKI - edr_workflows:resolver:qa:serverless"
113119
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh edr_workflows:resolver:qa:serverless
@@ -123,6 +129,8 @@ steps:
123129
automatic:
124130
- exit_status: "1"
125131
limit: 1
132+
soft_fail:
133+
- exit_status: 101
126134

127135
- label: "API MKI - edr_workflows:response_actions:qa:serverless"
128136
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh edr_workflows:response_actions:qa:serverless
@@ -138,3 +146,5 @@ steps:
138146
automatic:
139147
- exit_status: "1"
140148
limit: 1
149+
soft_fail:
150+
- exit_status: 101

0 commit comments

Comments
 (0)