Skip to content

Commit 49b7cf5

Browse files
dominiqueclarkedominiqueclarke
authored
Merge branch 'main' into feature/observability-custom-roles-on-by-default
2 parents 049c79d + 5ef053f commit 49b7cf5

2,829 files changed

Lines changed: 33218 additions & 24494 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_oblt_stateful_configs.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ disabled:
2020
- x-pack/solutions/observability/plugins/ux/e2e/synthetics_run.ts
2121
- x-pack/solutions/observability/plugins/slo/e2e/synthetics_run.ts
2222

23+
# Configs that exist but weren't running in CI when this file was introduced
24+
- x-pack/solutions/observability/test/screenshot_creation/config.ts
25+
2326
# Observability AI Assistant local-only tests
2427
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts
2528

@@ -35,7 +38,7 @@ enabled:
3538
- x-pack/solutions/observability/test/apm_api_integration/cloud/config.ts
3639
- x-pack/solutions/observability/test/apm_api_integration/rules/config.ts
3740
- x-pack/solutions/observability/test/apm_api_integration/trial/config.ts
38-
- x-pack/test/dataset_quality_api_integration/basic/config.ts
41+
- x-pack/solutions/observability/test/dataset_quality_api_integration/basic/config.ts
3942
- x-pack/test/functional/apps/dataset_quality/config.ts
4043
- x-pack/solutions/observability/test/functional/apps/uptime/config.ts
4144
- x-pack/solutions/observability/test/observability_api_integration/basic/config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ disabled:
1313
- x-pack/platform/test/functional_with_es_ssl/config.base.ts
1414
- x-pack/test/api_integration/config.ts
1515
- x-pack/platform/test/api_integration/config.ts
16-
- x-pack/test/fleet_api_integration/config.base.ts
16+
- x-pack/platform/test/fleet_api_integration/config.base.ts
1717
- x-pack/platform/test/functional_basic/apps/ml/config.base.ts
1818
- x-pack/platform/test/functional_basic/apps/transform/config.base.ts
1919
- x-pack/platform/test/api_integration_basic/config.basic_license.ts
@@ -32,7 +32,6 @@ disabled:
3232
- x-pack/platform/test/cloud_integration/config.ts
3333
- x-pack/platform/test/load/config.ts
3434
- x-pack/platform/test/plugin_api_perf/config.ts
35-
- x-pack/test/screenshot_creation/config.ts
3635
- x-pack/platform/test/screenshot_creation/config.ts
3736
- x-pack/platform/test/fleet_packages/config.ts
3837

@@ -165,13 +164,13 @@ enabled:
165164
- x-pack/platform/test/cases_api_integration/spaces_only/config.ts
166165
- x-pack/platform/test/disable_ems/config.ts
167166
- x-pack/platform/test/examples/config.ts
168-
- x-pack/test/fleet_api_integration/config.agent.ts
169-
- x-pack/test/fleet_api_integration/config.agent_policy.ts
170-
- x-pack/test/fleet_api_integration/config.epm.ts
171-
- x-pack/test/fleet_api_integration/config.event_ingested.ts
172-
- x-pack/test/fleet_api_integration/config.fleet.ts
173-
- x-pack/test/fleet_api_integration/config.package_policy.ts
174-
- x-pack/test/fleet_api_integration/config.space_awareness.ts
167+
- x-pack/platform/test/fleet_api_integration/config.agent.ts
168+
- x-pack/platform/test/fleet_api_integration/config.agent_policy.ts
169+
- x-pack/platform/test/fleet_api_integration/config.epm.ts
170+
- x-pack/platform/test/fleet_api_integration/config.event_ingested.ts
171+
- x-pack/platform/test/fleet_api_integration/config.fleet.ts
172+
- x-pack/platform/test/fleet_api_integration/config.package_policy.ts
173+
- x-pack/platform/test/fleet_api_integration/config.space_awareness.ts
175174
- x-pack/test/fleet_functional/config.ts
176175
- x-pack/platform/test/fleet_tasks/config.ts
177176
- x-pack/platform/test/ftr_apis/security_and_spaces/config.ts
@@ -284,10 +283,10 @@ enabled:
284283
- x-pack/test/rule_registry/security_and_spaces/config_trial.ts
285284
- x-pack/test/rule_registry/spaces_only/config_basic.ts
286285
- x-pack/test/rule_registry/spaces_only/config_trial.ts
287-
- x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
288-
- x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
289-
- x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
290-
- x-pack/test/saved_object_tagging/functional/config.ts
286+
- x-pack/platform/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
287+
- x-pack/platform/test/saved_object_tagging/api_integration/tagging_api/config.ts
288+
- x-pack/platform/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
289+
- x-pack/platform/test/saved_object_tagging/functional/config.ts
291290
- x-pack/platform/test/saved_objects_field_count/config.ts
292291
- x-pack/platform/test/search_sessions_integration/config.ts
293292
- x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts
@@ -331,7 +330,7 @@ enabled:
331330
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
332331
- x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts
333332
- x-pack/platform/test/ui_capabilities/spaces_only/config.ts
334-
- x-pack/test/upgrade_assistant_integration/config.ts
333+
- x-pack/platform/test/upgrade_assistant_integration/config.ts
335334
- x-pack/platform/test/usage_collection/config.ts
336335
- x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
337336
- x-pack/performance/journeys_e2e/ecommerce_dashboard.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ disabled:
1414
# QA suites that are run out-of-band
1515
- x-pack/solutions/security/test/cloud_security_posture_functional/config.cloud.ts
1616

17+
# Configs that exist but weren't running in CI when this file was introduced
18+
- x-pack/solutions/security/test/screenshot_creation/config.ts
19+
1720
# Cypress configs, for now these are still run manually
1821
- x-pack/solutions/security/test/defend_workflows_cypress/cli_config.ts
1922
- x-pack/solutions/security/test/defend_workflows_cypress/config.ts
@@ -127,3 +130,6 @@ enabled:
127130
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts
128131
- x-pack/solutions/security/test/api_integration_basic/config.ts
129132
- x-pack/solutions/security/test/api_integration/apis/cases/config.ts
133+
- x-pack/solutions/security/test/fleet_api_integration/config.agent.ts
134+
- x-pack/solutions/security/test/fleet_api_integration/config.epm.ts
135+
- x-pack/solutions/security/test/fleet_api_integration/config.package_policy.ts

‎.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_detection_engine.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- group: 'Cypress MKI - Detection Engine'
33
key: cypress_test_detections_engine
44
steps:
5-
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:detection_engine
5+
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:detection_engine:all
66
label: 'Cypress MKI - Detection Engine'
77
key: test_detection_engine
88
env:
@@ -16,20 +16,6 @@ steps:
1616
timeout_in_minutes: 300
1717
parallelism: 1
1818

19-
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:detection_engine:exceptions
20-
label: 'Cypress MKI - Detection Engine - Exceptions'
21-
key: test_detection_engine_exceptions
22-
env:
23-
BK_TEST_SUITE_KEY: 'serverless-cypress-detection-engine'
24-
agents:
25-
image: family/kibana-ubuntu-2004
26-
imageProject: elastic-images-prod
27-
provider: gcp
28-
machineType: n2-standard-4
29-
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
30-
timeout_in_minutes: 300
31-
parallelism: 1
32-
3319
- group: 'API MKI - Detection Engine'
3420
key: api_test_detections_engine
3521
steps:

‎.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_entity_analytics.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
steps:
2-
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:entity_analytics
2+
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:entity_analytics:all
33
label: 'Cypress MKI - Entity Analytics'
44
key: test_entity_analytics
55
env:

‎.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_explore.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
steps:
2-
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:explore
2+
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:explore:all
33
key: test_explore
44
label: 'Cypress MKI - Explore'
55
env:

‎.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_investigations.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
steps:
2-
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:investigations
2+
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:investigations:all
33
key: test_investigations
44
label: 'Cypress MKI - Investigations'
55
env:

‎.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_rule_management.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- group: 'Cypress MKI - Rule Management'
33
key: cypress_test_rule_management
44
steps:
5-
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:rule_management
5+
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:rule_management:all
66
label: 'Cypress MKI - Rule Management'
77
key: test_rule_management
88
env:
@@ -16,20 +16,6 @@ steps:
1616
timeout_in_minutes: 300
1717
parallelism: 1
1818

19-
- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:rule_management:prebuilt_rules
20-
label: 'Cypress MKI - Rule Management - Prebuilt Rules'
21-
key: test_rule_management_prebuilt_rules
22-
env:
23-
BK_TEST_SUITE_KEY: 'serverless-cypress-rule-management'
24-
agents:
25-
image: family/kibana-ubuntu-2004
26-
imageProject: elastic-images-prod
27-
provider: gcp
28-
machineType: n2-standard-4
29-
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
30-
timeout_in_minutes: 300
31-
parallelism: 1
32-
3319
- group: 'API MKI - Rule Management'
3420
key: api_test_rule_management
3521
steps:

‎.eslintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ module.exports = {
788788
'x-pack/test/*/*config.*ts',
789789
'x-pack/platform/test/saved_object_api_integration/*/apis/**/*',
790790
'x-pack/platform/test/ui_capabilities/*/tests/**/*',
791-
'x-pack/test/upgrade_assistant_integration/**/*',
791+
'x-pack/platform/test/upgrade_assistant_integration/**/*',
792792
'x-pack/test/performance/**/*.ts',
793793
'**/cypress.config.{js,ts}',
794794
'x-pack/test_serverless/**/config*.ts',

0 commit comments

Comments
 (0)