From e6925cf24e6a7be0590587ddd23fc5bd62876a82 Mon Sep 17 00:00:00 2001 From: Robert Oskamp Date: Thu, 12 Oct 2023 11:03:58 +0200 Subject: [PATCH] [FTR] Serverless - tag initial set of tests for ES gate (#168622) ## Summary This PR adds the `esGate` tag to an initial set of serverless API integration test suites. Tests with this tag will be run as part of the Elasticsearch process. --- .../api_integration/test_suites/common/alerting/index.ts | 2 ++ .../api_integration/test_suites/common/core/index.ts | 4 +++- .../test_suites/common/data_view_field_editor/index.ts | 4 +++- .../api_integration/test_suites/common/data_views/index.ts | 4 +++- .../test_suites/common/elasticsearch_api/index.ts | 4 +++- .../test_suites/common/index_management/index.ts | 2 ++ .../api_integration/test_suites/common/kql_telemetry/index.ts | 4 +++- .../api_integration/test_suites/common/management/index.ts | 4 +++- .../test_suites/common/platform_security/index.ts | 2 ++ .../api_integration/test_suites/common/reporting/index.ts | 2 ++ .../api_integration/test_suites/common/scripts_tests/index.js | 4 +++- .../api_integration/test_suites/common/search_oss/index.ts | 4 +++- .../api_integration/test_suites/common/search_xpack/index.ts | 4 +++- .../api_integration/test_suites/observability/index.ts | 2 ++ .../api_integration/test_suites/search/index.ts | 2 ++ .../api_integration/test_suites/security/index.ts | 2 ++ 16 files changed, 41 insertions(+), 9 deletions(-) diff --git a/x-pack/test_serverless/api_integration/test_suites/common/alerting/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/alerting/index.ts index 4367656feae60..9585819a7ffe6 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/alerting/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/alerting/index.ts @@ -9,6 +9,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Alerting APIs', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./rules')); loadTestFile(require.resolve('./alert_documents')); loadTestFile(require.resolve('./summary_actions')); diff --git a/x-pack/test_serverless/api_integration/test_suites/common/core/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/core/index.ts index f55f77bd7e6ab..aa847e0c0ecea 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/core/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/core/index.ts @@ -8,7 +8,9 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('core', () => { + describe('core', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./compression')); loadTestFile(require.resolve('./translations')); loadTestFile(require.resolve('./capabilities')); diff --git a/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor/index.ts index 561b4798d2c28..7998f8b63f92c 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor/index.ts @@ -8,7 +8,9 @@ import type { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('index pattern field editor', () => { + describe('index pattern field editor', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./field_preview')); }); } diff --git a/x-pack/test_serverless/api_integration/test_suites/common/data_views/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/data_views/index.ts index eb25b2530a5e7..dafe36565a8fe 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/data_views/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/data_views/index.ts @@ -8,7 +8,9 @@ import type { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('index_patterns', () => { + describe('index_patterns', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./es_errors')); loadTestFile(require.resolve('./fields_for_wildcard_route')); loadTestFile(require.resolve('./data_views_crud')); diff --git a/x-pack/test_serverless/api_integration/test_suites/common/elasticsearch_api/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/elasticsearch_api/index.ts index 0d53235d8e0b6..aafab33abb587 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/elasticsearch_api/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/elasticsearch_api/index.ts @@ -8,7 +8,9 @@ import type { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('Elasticsearch API', () => { + describe('Elasticsearch API', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./home')); }); } diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/index.ts index cf0bf24cb99b4..7dff563bf43b3 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/index.ts @@ -9,6 +9,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Index Management APIs', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./index_templates')); loadTestFile(require.resolve('./indices')); loadTestFile(require.resolve('./create_enrich_policies')); diff --git a/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry/index.ts index 07b76ff08e58c..8a832ef82169e 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry/index.ts @@ -8,7 +8,9 @@ import type { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('KQL', () => { + describe('KQL', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./kql_telemetry')); }); } diff --git a/x-pack/test_serverless/api_integration/test_suites/common/management/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/management/index.ts index 9c634b7f5590f..73e79c6a199fb 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/management/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/management/index.ts @@ -8,7 +8,9 @@ import type { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('Management', () => { + describe('Management', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./ingest_pipelines')); loadTestFile(require.resolve('./rollups')); loadTestFile(require.resolve('./scripted_fields')); diff --git a/x-pack/test_serverless/api_integration/test_suites/common/platform_security/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/platform_security/index.ts index 8297aa53bfc6b..8d5970aa843ac 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/platform_security/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/platform_security/index.ts @@ -9,6 +9,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('serverless common API', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./anonymous')); loadTestFile(require.resolve('./api_keys')); loadTestFile(require.resolve('./authentication')); diff --git a/x-pack/test_serverless/api_integration/test_suites/common/reporting/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/reporting/index.ts index 12efd676636e9..b934d8cf178a6 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/reporting/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/reporting/index.ts @@ -9,6 +9,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default ({ loadTestFile }: FtrProviderContext) => { describe('Reporting', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./management')); loadTestFile(require.resolve('./generate_csv_discover')); loadTestFile(require.resolve('./download_csv_dashboard')); diff --git a/x-pack/test_serverless/api_integration/test_suites/common/scripts_tests/index.js b/x-pack/test_serverless/api_integration/test_suites/common/scripts_tests/index.js index d1eeb009a7cce..e6dae2f948174 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/scripts_tests/index.js +++ b/x-pack/test_serverless/api_integration/test_suites/common/scripts_tests/index.js @@ -8,7 +8,9 @@ export default function ({ loadTestFile }) { // TODO: The `scripts` folder was renamed to `scripts_tests` because the folder // name `scripts` triggers the `eslint@kbn/imports/no_boundary_crossing` rule - describe('scripts', () => { + describe('scripts', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./languages')); }); } diff --git a/x-pack/test_serverless/api_integration/test_suites/common/search_oss/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/search_oss/index.ts index 598493bfd2182..79ff29fdf9f22 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/search_oss/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/search_oss/index.ts @@ -10,7 +10,9 @@ import type { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { // TODO: This `search` folder was renamed to `search_oss` to // differentiate it from the x-pack `search` folder (now `search_xpack`) - describe('search', () => { + describe('search', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./search')); // TODO: Removed `sql_search` since // SQL is not supported in Serverless diff --git a/x-pack/test_serverless/api_integration/test_suites/common/search_xpack/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/search_xpack/index.ts index fc433f4655977..e832bc22d2fda 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/search_xpack/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/search_xpack/index.ts @@ -10,7 +10,9 @@ import type { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { // TODO: This `search` folder was renamed to `search_xpack` to // differentiate it from the oss `search` folder (now `search_oss`) - describe('search', () => { + describe('search', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./search')); // TODO: Removed `session` since search // sessions are not supported in Serverless diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/index.ts b/x-pack/test_serverless/api_integration/test_suites/observability/index.ts index 9ff9af85e855b..f7d428387370a 100644 --- a/x-pack/test_serverless/api_integration/test_suites/observability/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/observability/index.ts @@ -9,6 +9,8 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Serverless observability API', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./fleet/fleet')); loadTestFile(require.resolve('./telemetry/snapshot_telemetry')); loadTestFile(require.resolve('./telemetry/telemetry_config')); diff --git a/x-pack/test_serverless/api_integration/test_suites/search/index.ts b/x-pack/test_serverless/api_integration/test_suites/search/index.ts index ff29a499c6eab..7b5f69bc5da8b 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/search/index.ts @@ -9,6 +9,8 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Serverless search API', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./telemetry/snapshot_telemetry')); loadTestFile(require.resolve('./telemetry/telemetry_config')); loadTestFile(require.resolve('./cases/find_cases')); diff --git a/x-pack/test_serverless/api_integration/test_suites/security/index.ts b/x-pack/test_serverless/api_integration/test_suites/security/index.ts index 5d637ee78b58d..e439cf8b76e8b 100644 --- a/x-pack/test_serverless/api_integration/test_suites/security/index.ts +++ b/x-pack/test_serverless/api_integration/test_suites/security/index.ts @@ -9,6 +9,8 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Serverless security API', function () { + this.tags(['esGate']); + loadTestFile(require.resolve('./telemetry/snapshot_telemetry')); loadTestFile(require.resolve('./telemetry/telemetry_config')); loadTestFile(require.resolve('./fleet/fleet'));