[ska] relocate api_integration_basic & defend_workflows_cypress tests (#225374)

## Summary

Part of https://github.com/elastic/kibana-team/issues/1503

Before:

```
x-pack/test/
     | - api_integration_basic/
     | - defend_workflows_cypress/
```

After: 
```
x-pack/solutions/security/test/
     | - api_integration_basic/
     | - defend_workflows_cypress/
```

---------

Co-authored-by: Cesare de Cal <cesare.decal@elastic.co>
This commit is contained in:
Dzmitry Lemechko 2025-06-26 19:43:58 +03:00 committed by GitHub
parent b0d7180ff8
commit 868a4657ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 15 additions and 17 deletions

View file

@ -154,7 +154,6 @@ enabled:
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group4/config_with_schedule_circuit_breaker.ts - x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group4/config_with_schedule_circuit_breaker.ts
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/actions/config.ts - x-pack/platform/test/alerting_api_integration/spaces_only/tests/actions/config.ts
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts - x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts
- x-pack/test/api_integration_basic/config.ts
- x-pack/test/api_integration/apis/cases/config.ts - x-pack/test/api_integration/apis/cases/config.ts
- x-pack/test/api_integration/apis/security/config.ts - x-pack/test/api_integration/apis/security/config.ts
- x-pack/test/banners_functional/config.ts - x-pack/test/banners_functional/config.ts

View file

@ -4,11 +4,11 @@ disabled:
- x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts - x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts - x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.ai4dsoc.ts - x-pack/test/security_solution_api_integration/config/serverless/config.base.ai4dsoc.ts
- x-pack/test/defend_workflows_cypress/serverless_config.base.ts - x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.base.ts
- x-pack/solutions/security/test/osquery_cypress/serverless_config.base.ts - x-pack/solutions/security/test/osquery_cypress/serverless_config.base.ts
# Cypress configs, for now these are still run manually # Cypress configs, for now these are still run manually
- x-pack/test/defend_workflows_cypress/serverless_config.ts - x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.ts
- x-pack/solutions/security/test/osquery_cypress/serverless_cli_config.ts - x-pack/solutions/security/test/osquery_cypress/serverless_cli_config.ts
- x-pack/test/security_solution_cypress/serverless_config.ts - x-pack/test/security_solution_cypress/serverless_config.ts
- x-pack/test/security_solution_cypress/ai4dsoc_serverless_config.ts - x-pack/test/security_solution_cypress/ai4dsoc_serverless_config.ts

View file

@ -15,8 +15,8 @@ disabled:
- x-pack/solutions/security/test/cloud_security_posture_functional/config.cloud.ts - x-pack/solutions/security/test/cloud_security_posture_functional/config.cloud.ts
# Cypress configs, for now these are still run manually # Cypress configs, for now these are still run manually
- x-pack/test/defend_workflows_cypress/cli_config.ts - x-pack/solutions/security/test/defend_workflows_cypress/cli_config.ts
- x-pack/test/defend_workflows_cypress/config.ts - x-pack/solutions/security/test/defend_workflows_cypress/config.ts
- x-pack/solutions/security/test/osquery_cypress/cli_config.ts - x-pack/solutions/security/test/osquery_cypress/cli_config.ts
- x-pack/solutions/security/test/osquery_cypress/config.ts - x-pack/solutions/security/test/osquery_cypress/config.ts
- x-pack/solutions/security/test/osquery_cypress/visual_config.ts - x-pack/solutions/security/test/osquery_cypress/visual_config.ts
@ -125,3 +125,4 @@ enabled:
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts - x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial.ts - x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial.ts
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts - x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts
- x-pack/solutions/security/test/api_integration_basic/config.ts

View file

@ -224,7 +224,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^src\/platform\/packages\/shared\/kbn-securitysolution-.*/, /^src\/platform\/packages\/shared\/kbn-securitysolution-.*/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/, /^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/,
/^x-pack\/solutions\/security\/plugins\/security_solution/, /^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/test\/defend_workflows_cypress/, /^x-pack\/solutions\/security\/test\/defend_workflows_cypress/,
/^x-pack\/test\/security_solution_cypress/, /^x-pack\/test\/security_solution_cypress/,
/^fleet_packages\.json/, /^fleet_packages\.json/,
])) || ])) ||

10
.github/CODEOWNERS vendored
View file

@ -1760,9 +1760,6 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
/x-pack/test/common/services/index.ts @elastic/appex-qa /x-pack/test/common/services/index.ts @elastic/appex-qa
/x-pack/test/common/services/bsearch_secure.ts @elastic/appex-qa /x-pack/test/common/services/bsearch_secure.ts @elastic/appex-qa
/x-pack/test/common/ftr_provider_context.ts @elastic/appex-qa /x-pack/test/common/ftr_provider_context.ts @elastic/appex-qa
/x-pack/test/api_integration_basic/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/test/api_integration_basic/config.ts @elastic/appex-qa
/x-pack/test/api_integration_basic/apis/index.ts @elastic/appex-qa
/x-pack/test/api_integration/services/index.ts @elastic/appex-qa /x-pack/test/api_integration/services/index.ts @elastic/appex-qa
/x-pack/test/api_integration/services/es_supertest_without_auth.js @elastic/appex-qa /x-pack/test/api_integration/services/es_supertest_without_auth.js @elastic/appex-qa
/x-pack/test/api_integration/config.ts @elastic/appex-qa /x-pack/test/api_integration/config.ts @elastic/appex-qa
@ -2115,8 +2112,8 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
/x-pack/test/functional_with_es_ssl/lib/object_remover.ts @elastic/response-ops /x-pack/test/functional_with_es_ssl/lib/object_remover.ts @elastic/response-ops
/x-pack/test/stack_functional_integration/apps/alerts @elastic/response-ops /x-pack/test/stack_functional_integration/apps/alerts @elastic/response-ops
/x-pack/test/functional/services/actions @elastic/response-ops /x-pack/test/functional/services/actions @elastic/response-ops
/x-pack/test/api_integration_basic/apis/security_solution/index.ts @elastic/response-ops /x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts @elastic/response-ops @elastic/kibana-cases
/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops /x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops @elastic/kibana-cases
/x-pack/test/upgrade/services/rules_upgrade_services.ts @elastic/response-ops /x-pack/test/upgrade/services/rules_upgrade_services.ts @elastic/response-ops
/x-pack/test/upgrade/apps/rules @elastic/response-ops /x-pack/test/upgrade/apps/rules @elastic/response-ops
/x-pack/test/examples/triggers_actions_ui_examples @elastic/response-ops # Assigned per https://github.com/elastic/kibana/blob/main/x-pack/examples/triggers_actions_ui_example/kibana.jsonc#L4 /x-pack/test/examples/triggers_actions_ui_examples @elastic/response-ops # Assigned per https://github.com/elastic/kibana/blob/main/x-pack/examples/triggers_actions_ui_example/kibana.jsonc#L4
@ -2540,6 +2537,7 @@ x-pack/test/security_solution_api_integration/test_suites/investigations @elasti
/x-pack/platform/plugins/shared/stack_connectors/public/connector_types/sentinelone @elastic/security-defend-workflows /x-pack/platform/plugins/shared/stack_connectors/public/connector_types/sentinelone @elastic/security-defend-workflows
/x-pack/platform/plugins/shared/stack_connectors/server/connector_types/sentinelone @elastic/security-defend-workflows /x-pack/platform/plugins/shared/stack_connectors/server/connector_types/sentinelone @elastic/security-defend-workflows
/x-pack/platform/plugins/shared/stack_connectors/common/sentinelone @elastic/security-defend-workflows /x-pack/platform/plugins/shared/stack_connectors/common/sentinelone @elastic/security-defend-workflows
/x-pack/solutions/security/test/api_integration_basic @elastic/security-defend-workflows
/x-pack/solutions/security/test/alerting_api_integration/security_and_spaces @elastic/security-defend-workflows /x-pack/solutions/security/test/alerting_api_integration/security_and_spaces @elastic/security-defend-workflows
/x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/sentinelone.ts @elastic/security-defend-workflows /x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/sentinelone.ts @elastic/security-defend-workflows
/x-pack/platform/plugins/shared/stack_connectors/server/connector_types/crowdstrike @elastic/security-defend-workflows /x-pack/platform/plugins/shared/stack_connectors/server/connector_types/crowdstrike @elastic/security-defend-workflows
@ -2637,7 +2635,7 @@ x-pack/test/security_solution_api_integration/test_suites/investigations @elasti
/x-pack/solutions/security/plugins/security_solution/public/common/components/threat_match @elastic/security-detection-engine /x-pack/solutions/security/plugins/security_solution/public/common/components/threat_match @elastic/security-detection-engine
## Security Solution sub teams - security-defend-workflows ## Security Solution sub teams - security-defend-workflows
/x-pack/test/defend_workflows_cypress @elastic/security-defend-workflows /x-pack/solutions/security/test/defend_workflows_cypress @elastic/security-defend-workflows
/x-pack/platform/test/api_integration/apis/osquery @elastic/security-defend-workflows /x-pack/platform/test/api_integration/apis/osquery @elastic/security-defend-workflows
/x-pack/solutions/security/plugins/security_solution/public/management/ @elastic/security-defend-workflows /x-pack/solutions/security/plugins/security_solution/public/management/ @elastic/security-defend-workflows
/x-pack/solutions/security/plugins/security_solution/public/common/lib/endpoint/ @elastic/security-defend-workflows /x-pack/solutions/security/plugins/security_solution/public/common/lib/endpoint/ @elastic/security-defend-workflows

View file

@ -10,10 +10,10 @@
"cypress": "../../../../../node_modules/.bin/cypress", "cypress": "../../../../../node_modules/.bin/cypress",
"cypress:burn": "yarn cypress:dw run --env burn=2 --headed", "cypress:burn": "yarn cypress:dw run --env burn=2 --headed",
"cypress:changed-specs-only": "yarn cypress:dw run --changed-specs-only --env burn=2", "cypress:changed-specs-only": "yarn cypress:dw run --changed-specs-only --env burn=2",
"cypress:dw": "node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress.config.ts --ftr-config-file ../../../../test/defend_workflows_cypress/cli_config", "cypress:dw": "node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress.config.ts --ftr-config-file ../../../../solutions/security/test/defend_workflows_cypress/cli_config",
"cypress:dw:open": "yarn cypress:dw open", "cypress:dw:open": "yarn cypress:dw open",
"cypress:dw:run": "yarn cypress:dw run", "cypress:dw:run": "yarn cypress:dw run",
"cypress:dw:serverless": "node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress_serverless.config.ts --ftr-config-file ../../../../test/defend_workflows_cypress/serverless_config", "cypress:dw:serverless": "node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress_serverless.config.ts --ftr-config-file ../../../../solutions/security/test/defend_workflows_cypress/serverless_config",
"cypress:dw:serverless:open": "yarn cypress:dw:serverless open", "cypress:dw:serverless:open": "yarn cypress:dw:serverless open",
"cypress:dw:serverless:run": "yarn cypress:dw:serverless run", "cypress:dw:serverless:run": "yarn cypress:dw:serverless run",
"cypress:dw:qa:serverless": "node ./scripts/start_cypress_parallel_serverless --config-file plugins/security_solution/public/management/cypress/cypress_serverless_qa.config.ts", "cypress:dw:qa:serverless": "node ./scripts/start_cypress_parallel_serverless --config-file plugins/security_solution/public/management/cypress/cypress_serverless_qa.config.ts",

View file

@ -102,7 +102,7 @@ finished.
This is the configuration used by CI. It uses the FTR to spawn both a Kibana instance (http://localhost:5620) and an This is the configuration used by CI. It uses the FTR to spawn both a Kibana instance (http://localhost:5620) and an
Elasticsearch instance (http://localhost:9220) with a preloaded minimum set of data (see preceding "Test data" section), Elasticsearch instance (http://localhost:9220) with a preloaded minimum set of data (see preceding "Test data" section),
and then executes cypress against this stack. You can find this configuration in `x-pack/test/defend_workflows_cypress` and then executes cypress against this stack. You can find this configuration in `x-pack/solutions/security/test/defend_workflows_cypress`
### Test Execution: Examples ### Test Execution: Examples

View file

@ -8,7 +8,7 @@
import { FtrProviderContext } from '../../ftr_provider_context'; import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) { export default function ({ loadTestFile }: FtrProviderContext) {
describe('SecuritySolution Endpoints basic licsense', () => { describe('Security Solution Endpoints basic license', () => {
loadTestFile(require.resolve('./cases_privileges')); loadTestFile(require.resolve('./cases_privileges'));
}); });
} }

View file

@ -15,7 +15,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
require.resolve('@kbn/test-suites-src/common/config') require.resolve('@kbn/test-suites-src/common/config')
); );
const xpackFunctionalTestsConfig = await readConfigFile( const xpackFunctionalTestsConfig = await readConfigFile(
require.resolve('../functional/config.base.js') require.resolve('@kbn/test-suites-xpack-platform/functional/config.base')
); );
const hostIp = getLocalhostRealIp(); const hostIp = getLocalhostRealIp();