elastic · Ikuni17 · Aug 14, 2025 · Aug 12, 2025 · Aug 12, 2025 · Aug 12, 2025
@@ -12,9 +12,9 @@ steps:
     steps:
       - command: .buildkite/scripts/steps/test/ftr_configs.sh
         env:
-          FTR_CONFIG: "x-pack/test/security_solution_api_integration/test_suites/genai/evaluations/trial_license_complete_tier/configs/ess.config.ts"
+          FTR_CONFIG: 'x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/evaluations/trial_license_complete_tier/configs/ess.config.ts'
           FTR_CONFIG_GROUP_KEY: 'ftr-security-solution-gen-ai-evaluations'
-          FTR_SECURITY_GEN_AI: "1"
+          FTR_SECURITY_GEN_AI: '1'
         label: Security Solution Gen AI Evaluations
         key: security-solution-gen-ai-evaluations
         timeout_in_minutes: 50

@@ -1,5 +1,5 @@
 env:
-  FTR_SECURITY_GEN_AI: "1"
+  FTR_SECURITY_GEN_AI: '1'
 steps:
   - label: '👨‍🔧 Pre-Build'
     command: .buildkite/scripts/lifecycle/pre_build.sh
@@ -25,9 +25,9 @@ steps:
 
   - command: .buildkite/scripts/steps/test/ftr_configs.sh
     env:
-      FTR_CONFIG: "x-pack/test/security_solution_api_integration/test_suites/genai/evaluations/trial_license_complete_tier/configs/ess.config.ts"
+      FTR_CONFIG: 'x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/evaluations/trial_license_complete_tier/configs/ess.config.ts'
       FTR_CONFIG_GROUP_KEY: 'ftr-security-solution-gen-ai-evaluations'
-      FTR_SECURITY_GEN_AI: "1"
+      FTR_SECURITY_GEN_AI: '1'
     label: Security Solution Gen AI Evaluations
     key: ftr-security-solution-gen-ai-evaluations
     timeout_in_minutes: 50
@@ -44,5 +44,3 @@ steps:
           limit: 3
         - exit_status: '*'
           limit: 1
-
-
@@ -16,7 +16,7 @@ source .buildkite/scripts/pipelines/security_solution_quality_gate/prepare_vault
 
 echo "--- Running test script $1"
 
-cd x-pack/test/security_solution_api_integration
+cd x-pack/solutions/security/test/security_solution_api_integration
 set +e
 
 TARGET_SCRIPT=$1 node ./scripts/mki_start_api_ftr_execution

@@ -798,8 +798,8 @@ module.exports = {
         'x-pack/platform/test/serverless/*/configs/**/*',
         'x-pack/test_serverless/*/test_suites/**/*',
         'x-pack/test/profiling_api_integration/**/*.ts',
-        'x-pack/test/security_solution_api_integration/*/test_suites/**/*',
-        'x-pack/test/security_solution_api_integration/**/config*.ts',
+        'x-pack/solutions/security/test/security_solution_api_integration/*/test_suites/**/*',
+        'x-pack/solutions/security/test/security_solution_api_integration/**/config*.ts',
         '**/playwright.config.ts',
       ],
       rules: {

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2418,22 +2418,21 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
 #CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-management
 
 # Security Solution
-/x-pack/solutions/security/test/fixtures/kbn_archives/timelines/7.15.0_space @elastic/security-solution # Assigned per only use: https://github.com/elastic/kibana/blob/main/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts#L58
+/x-pack/solutions/security/test/fixtures/kbn_archives/timelines/7.15.0_space @elastic/security-solution # Assigned per only use: https://github.com/elastic/kibana/blob/main/x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts#L58
 /x-pack/solutions/security/test/fixtures/es_archives/packetbeat @elastic/security-solution
-/x-pack/test/security_solution_ftr @elastic/security-solution
 /x-pack/solutions/security/test/fixtures/es_archives/security_solution @elastic/security-solution
 /x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions @elastic/security-solution # Assigned per https://github.com/elastic/kibana/pull/199795/files/ae80bb252bc71f787c122849fcb9b01e386fc5e9#r1840233040
 /x-pack/solutions/security/test/functional/ @elastic/security-solution
 /x-pack/solutions/security/test/functional_solution_sidenav/ @elastic/security-solution
 /x-pack/test/common/utils/security_solution/index.ts @elastic/security-solution
 /x-pack/test/common/utils/security_solution/spaces.ts @elastic/security-detection-rule-management
 /x-pack/solutions/security/test/plugin_functional/ @elastic/security-solution
-/x-pack/test/common/services/security_solution @elastic/security-solution
+/x-pack/solutions/security/test/api_integration/services @elastic/security-solution
 /x-pack/test/api_integration/services/security_solution_*.gen.ts @elastic/security-solution
 /x-pack/solutions/security/test/accessibility/ @elastic/security-solution
 /x-pack/solutions/security/test/fixtures/es_archives/endpoint/ @elastic/security-solution
 /x-pack/platform/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
-/x-pack/test/security_solution_api_integration @elastic/security-solution
+/x-pack/solutions/security/test/security_solution_api_integration @elastic/security-solution
 /x-pack/test/api_integration/apis/security_solution @elastic/security-solution
 /x-pack/platform/test/fixtures/es_archives/auditbeat/default @elastic/security-solution
 /x-pack/solutions/security/test/serverless/functional/test_suites/constants.ts @elastic/security-solution
@@ -2479,7 +2478,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
 # AI4DSOC in Security Solution
 /x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/ai4dsoc @elastic/security-engineering-productivity
 /x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/ai4dsoc/privileges @elastic/security-generative-ai
-/x-pack/test/security_solution_api_integration/test_suites/ai4dsoc @elastic/security-engineering-productivity
+/x-pack/solutions/security/test/security_solution_api_integration/test_suites/ai4dsoc @elastic/security-engineering-productivity
 
 # Security Solution cross teams ownership
 /x-pack/solutions/security/test/security_solution_cypress/cypress/fixtures @elastic/security-detections-response @elastic/security-threat-hunting
@@ -2499,11 +2498,11 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
 
 /x-pack/solutions/security/plugins/security_solution/server/routes @elastic/security-detections-response @elastic/security-threat-hunting
 /x-pack/solutions/security/plugins/security_solution/server/utils @elastic/security-detections-response @elastic/security-threat-hunting
-x-pack/test/security_solution_api_integration/test_suites/detections_response/utils @elastic/security-detections-response
-x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry @elastic/security-detections-response
-x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles @elastic/security-detections-response
-x-pack/test/security_solution_api_integration/test_suites/sources @elastic/security-detections-response
-/x-pack/test/security_solution_api_integration/config/services/detections_response/ @elastic/security-detections-response
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/utils @elastic/security-detections-response
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/telemetry @elastic/security-detections-response
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/user_roles @elastic/security-detections-response
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources @elastic/security-detections-response
+/x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response/ @elastic/security-detections-response
 /x-pack/solutions/security/test/fixtures/es_archives/signals @elastic/security-detections-response
 /x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family @elastic/security-detections-response
 
@@ -2530,7 +2529,7 @@ x-pack/platform/plugins/shared/entity_manager/server/lib/entities @elastic/entit
 x-pack/platform/plugins/shared/entity_manager/server/lib/auth @elastic/entity-store
 x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/entity_store @elastic/entity-store
 x-pack/solutions/security/plugins/security_solution/common/api/entity_analytics/entity_store @elastic/entity-store
-x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/ @elastic/entity-store
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/ @elastic/entity-store
 
 ## Security Solution sub teams - Threat Hunting
 
@@ -2543,7 +2542,7 @@ x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entit
 /x-pack/solutions/security/plugins/security_solution/public/siem_migrations @elastic/security-threat-hunting
 /x-pack/solutions/security/plugins/security_solution/server/lib/siem_migrations @elastic/security-threat-hunting
 
-x-pack/test/security_solution_api_integration/test_suites/siem_migrations @elastic/security-threat-hunting
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/siem_migrations @elastic/security-threat-hunting
 
 /x-pack/solutions/security/test/serverless/functional/test_suites/ftr/discover @elastic/security-threat-hunting
 x-pack/solutions/security/test/serverless/functional/configs/config.context_awareness.ts @elastic/security-threat-hunting
@@ -2639,7 +2638,7 @@ x-pack/solutions/security/test/serverless/functional/configs/config.context_awar
 
 /x-pack/platform/test/fixtures/es_archives/auditbeat/overview @elastic/security-threat-hunting-investigations
 
-x-pack/test/security_solution_api_integration/test_suites/investigations @elastic/security-threat-hunting-investigations
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigations @elastic/security-threat-hunting-investigations
 
 /x-pack/solutions/security/test/serverless/functional/configs/config.context_awareness.ts @elastic/security-threat-hunting-investigations
 
@@ -2700,7 +2699,7 @@ x-pack/platform/plugins/shared/actions/server/lib/token_tracking @elastic/securi
 /x-pack/solutions/security/plugins/security_solution/docs/rfcs/detection_response @elastic/security-detection-rule-management @elastic/security-detection-engine
 /x-pack/solutions/security/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules @elastic/security-detection-rule-management
 /x-pack/solutions/security/plugins/security_solution/docs/testing/test_plans/detection_response/rule_management @elastic/security-detection-rule-management
-/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management @elastic/security-detection-rule-management
+/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management @elastic/security-detection-rule-management
 
 /x-pack/solutions/security/plugins/security_solution/public/common/components/health_truncate_text @elastic/security-detection-rule-management
 /x-pack/solutions/security/plugins/security_solution/public/common/components/links_to_docs @elastic/security-detection-rule-management
@@ -2761,9 +2760,9 @@ x-pack/platform/plugins/shared/actions/server/lib/token_tracking @elastic/securi
 
 /x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine @elastic/security-detection-engine
 
-/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine @elastic/security-detection-engine
-/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/rule_gaps.ts @elastic/security-detection-engine
-/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists @elastic/security-detection-engine
+/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine @elastic/security-detection-engine
+/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/utils/rules/rule_gaps.ts @elastic/security-detection-engine
+/x-pack/solutions/security/test/security_solution_api_integration/test_suites/lists_and_exception_lists @elastic/security-detection-engine
 /x-pack/solutions/security/test/fixtures/es_archives/asset_criticality @elastic/security-detection-engine
 /x-pack/solutions/security/plugins/security_solution/server/usage/exceptions @elastic/security-detection-engine
 /x-pack/solutions/security/plugins/security_solution/server/usage/value_lists @elastic/security-detection-engine
@@ -2788,8 +2787,8 @@ x-pack/solutions/security/plugins/security_solution/server/assistant/tools/defen
 /x-pack/solutions/security/plugins/security_solution/server/lib/license/ @elastic/security-defend-workflows
 /x-pack/solutions/security/plugins/security_solution/server/fleet_integration/ @elastic/security-defend-workflows
 /x-pack/solutions/security/plugins/security_solution/scripts/endpoint/ @elastic/security-defend-workflows
-/x-pack/test/security_solution_endpoint/ @elastic/security-defend-workflows
-/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/ @elastic/security-defend-workflows
+/x-pack/solutions/security/test/security_solution_endpoint/ @elastic/security-defend-workflows
+/x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/ @elastic/security-defend-workflows
 /x-pack/solutions/security/plugins/security_solution_serverless/public/upselling/sections/endpoint_management @elastic/security-defend-workflows
 /x-pack/solutions/security/plugins/security_solution_serverless/public/upselling/pages/endpoint_management @elastic/security-defend-workflows
 /x-pack/solutions/security/plugins/security_solution_serverless/server/endpoint @elastic/security-defend-workflows
@@ -2842,11 +2841,11 @@ x-pack/solutions/security/test/security_solution_cypress/cypress/tasks/users @el
 x-pack/platform/test/fixtures/es_archives/auditbeat/hosts @elastic/security-entity-analytics
 x-pack/platform/test/fixtures/es_archives/auditbeat/uncommon_processes @elastic/security-entity-analytics
 x-pack/platform/test/fixtures/es_archives/auditbeat/users @elastic/security-entity-analytics
-x-pack/test/security_solution_api_integration/test_suites/entity_analytics @elastic/security-entity-analytics
-x-pack/test/security_solution_api_integration/test_suites/explore @elastic/security-entity-analytics
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics @elastic/security-entity-analytics
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/explore @elastic/security-entity-analytics
 
 ## Security Solution sub teams - GenAI
-x-pack/test/security_solution_api_integration/test_suites/genai @elastic/security-generative-ai
+x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai @elastic/security-generative-ai
 
 ## Security Solution sub teams - Automatic Import
 x-pack/platform/test/automatic_import_api_integration @elastic/security-scalability

@@ -35,7 +35,10 @@ module.exports = {
       },
     },
     {
-      files: ['*spaces_api_integration/common/services/basic_auth_supertest.ts'],
+      files: [
+        '*spaces_api_integration/common/services/basic_auth_supertest.ts',
+        // TODO: high chances missing awaits cause test flakiness, 37 errors spotted
+        'x-pack/solutions/security/test/security_solution_api_integration/**/*'],
       rules: {
         '@typescript-eslint/no-floating-promises': 'off',
       },

@@ -9,7 +9,7 @@ import type { Client } from '@elastic/elasticsearch';
 import { ALL_SAVED_OBJECT_INDICES } from '@kbn/core-saved-objects-server';
 
 /**
- * Copied from x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/refresh_index.ts
+ * Copied from x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/utils/refresh_index.ts
  *
  * Refresh an index, making changes available to search.
  * Reusable utility which refreshes all saved object indices, to make them available for search, especially

@@ -9,7 +9,7 @@ import type { RetryService } from '@kbn/ftr-common-functional-services';
 import type { ToolingLog } from '@kbn/tooling-log';
 
 /**
- * Copied from x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/retry.ts
+ * Copied from x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/utils/retry.ts
  *
  * Retry wrapper for async supertests, with a maximum number of retries.
  * You can pass in a function that executes a supertest test, and make assertions

@@ -51,13 +51,13 @@ FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner --config x-pack/test/secu
 In one terminal, run:
 
 ```bash
-FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:server --config x-pack/test/security_solution_endpoint/config.ts
+FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:server --config x-pack/solutions/security/test/security_solution_endpoint/config.ts
 ```
 
 In another terminal, run:
 
 ```bash
-FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner --config x-pack/test/security_solution_endpoint/config.ts
+FLEET_PACKAGE_REGISTRY_PORT=12345 yarn test:ftr:runner --config x-pack/solutions/security/test/security_solution_endpoint/config.ts
 ```
 
 ### Running your own package registry
@@ -86,13 +86,13 @@ PACKAGE_REGISTRY_URL_OVERRIDE=<url to your package registry like http://localhos
 In one terminal, run:
 
 ```bash
-PACKAGE_REGISTRY_URL_OVERRIDE=<url to your package registry like http://localhost:8080> yarn test:ftr:server --config x-pack/test/security_solution_endpoint/config.ts
+PACKAGE_REGISTRY_URL_OVERRIDE=<url to your package registry like http://localhost:8080> yarn test:ftr:server --config x-pack/solutions/security/test/security_solution_endpoint/config.ts
 ```
 
 In another terminal, run:
 
 ```bash
-PACKAGE_REGISTRY_URL_OVERRIDE=<url to your package registry like http://localhost:8080>  yarn test:ftr:runner --config x-pack/test/security_solution_endpoint/config.ts
+PACKAGE_REGISTRY_URL_OVERRIDE=<url to your package registry like http://localhost:8080>  yarn test:ftr:runner --config x-pack/solutions/security/test/security_solution_endpoint/config.ts
 ```
 
 ### Using the default public registry
@@ -120,13 +120,13 @@ yarn test:ftr:runner --config x-pack/test/security_solution_endpoint_api_int/con
 In one terminal, run:
 
 ```bash
-yarn test:ftr:server --config x-pack/test/security_solution_endpoint/config.ts
+yarn test:ftr:server --config x-pack/solutions/security/test/security_solution_endpoint/config.ts
 ```
 
 In another terminal, run:
 
 ```bash
-yarn test:ftr:runner --config x-pack/test/security_solution_endpoint/config.ts
+yarn test:ftr:runner --config x-pack/solutions/security/test/security_solution_endpoint/config.ts
 ```
 
 #### Generate huge amount of indices with huge amount of fields

@@ -23,7 +23,7 @@ describe('Blocklists API validations', () => {
   //  API TESTS FOR THIS ARTIFACT TYPE SHOULD BE COVERED WITH INTEGRATION TESTS.
   //  ADD THEM HERE:
   //
-  //  `x-pack/test/security_solution_api_integration/test_suites/edr_workflows`
+  //  `x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows`
   //
   // -----------------------------------------------------------------------------
 });
@@ -23,7 +23,7 @@ describe('Endpoint Exceptions API validations', () => {
   //  API TESTS FOR THIS ARTIFACT TYPE SHOULD BE COVERED WITH INTEGRATION TESTS.
   //  ADD THEM HERE:
   //
-  //  `x-pack/test/security_solution_api_integration/test_suites/edr_workflows`
+  //  `x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows`
   //
   // -----------------------------------------------------------------------------
 });
@@ -23,7 +23,7 @@ describe('Endpoint Exceptions API validations', () => {
   //  API TESTS FOR THIS ARTIFACT TYPE SHOULD BE COVERED WITH INTEGRATION TESTS.
   //  ADD THEM HERE:
   //
-  //  `x-pack/test/security_solution_api_integration/test_suites/edr_workflows`
+  //  `x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows`
   //
   // -----------------------------------------------------------------------------
 });