Skip to content

Commit 1499dce

Browse files
authored
Merge branch 'main' into alertingv2-agentbuilder-712
2 parents 7b0d5c0 + 5a074ae commit 1499dce

3,352 files changed

Lines changed: 134269 additions & 32022 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/ftr-manifests/ftr_platform_stateful_configs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ enabled:
242242
- x-pack/platform/test/functional/apps/transform/actions/config.ts
243243
- x-pack/platform/test/functional/apps/transform/edit_clone/config.ts
244244
- x-pack/platform/test/functional/apps/transform/permissions/config.ts
245-
- x-pack/platform/test/functional/apps/user_profiles/config.ts
246245
- x-pack/platform/test/functional/apps/visualize/config.ts
247246
- x-pack/platform/test/functional/config_security_basic.ts
248247
- x-pack/platform/test/functional/config.ccs.ts

.buildkite/ftr-manifests/ftr_security_serverless_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ enabled:
142142
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
143143
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
144144
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/serverless.config.ts
145+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/mitre_attack/entities/configs/serverless.config.ts
146+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/mitre_attack/feature_flag_disabled/configs/serverless.config.ts
145147
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts
146148
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/basic_license_essentials_tier/configs/serverless.config.ts
147149
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/serverless.config.ts

.buildkite/ftr-manifests/ftr_security_stateful_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ enabled:
122122
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/ess.config.ts
123123
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/ess.config.ts
124124
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
125+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/mitre_attack/entities/configs/ess.config.ts
126+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/mitre_attack/feature_flag_disabled/configs/ess.config.ts
125127
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts
126128
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/basic_license_essentials_tier/configs/ess.config.ts
127129
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/ess.config.ts

.buildkite/moon.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ tasks:
2323
# `.buildkite` tests read fixtures via process.cwd() expecting the repo root
2424
# (matching how the pipeline scripts run in CI), so jest must run from the
2525
# workspace root. Jest still scopes discovery to `.buildkite` because rootDir
26-
# defaults to the location of jest.config.js. We invoke `.buildkite`'s own jest
26+
# defaults to the location of jest.config.cjs. We invoke `.buildkite`'s own jest
2727
# binary (its isolated npm workspace), not the repo-root scripts/jest.
2828
jest:
2929
command: .buildkite/node_modules/.bin/jest
3030
args:
3131
- '--config'
32-
- .buildkite/jest.config.js
32+
- .buildkite/jest.config.cjs
3333
options:
3434
runFromWorkspaceRoot: true
3535
inputs:

0 commit comments

Comments
 (0)