Skip to content

Commit 8480083

Browse files
[ska] relocate oblt deployment-agnostic api integration tests (elastic#227194)
## Summary Part of elastic/kibana-team#1503 This PR is mostly about moving **observability deployment-agnostic tests** from x-pack/test ``` x-pack/test/api_integration/deployment_agnostic/ | - observability/apis/ | - configs/ | - feature_flag_configs/ ``` After: ``` x-pack/solutions/observability/test/api_integration_deployment_agnostic/ | - apis/ | - configs/ | - feature_flag_configs/ ``` Notes: - some services like `alertingApi` and `observabilityAIAssistantApi` were left as copies in original path as other oblt tests depend on them and we try to avoid circular dependencies caused by importing from solution test dirs. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
1 parent de4899e commit 8480083

502 files changed

Lines changed: 4329 additions & 924 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_serverless_configs.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ disabled:
77
- x-pack/test_serverless/functional/test_suites/observability/cypress/config_runner.ts
88

99
# Observability AI Assistant local-only tests
10-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant_local.serverless.config.ts
10+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant_local.serverless.config.ts
1111

1212
defaultQueue: 'n2-4-spot'
1313
enabled:
@@ -40,9 +40,9 @@ enabled:
4040
- x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts
4141
- x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts
4242
# serverless config files that run deployment-agnostic tests
43-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
44-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
45-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
46-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
47-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts
48-
- x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts
43+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.serverless.config.ts
44+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
45+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
46+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
47+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts
48+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts

.buildkite/ftr_oblt_stateful_configs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ disabled:
2020
- x-pack/solutions/observability/plugins/slo/e2e/synthetics_run.ts
2121

2222
# Observability AI Assistant local-only tests
23-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts
23+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts
2424

2525
defaultQueue: 'n2-4-spot'
2626
enabled:
@@ -48,7 +48,7 @@ enabled:
4848
- x-pack/test/functional/apps/apm/config.ts
4949
- x-pack/test/functional_with_es_ssl/apps/config.ts
5050
# stateful configs that run deployment-agnostic tests
51-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
52-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts
53-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant.stateful.config.ts
54-
- x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/stateful/oblt.stateful.config.ts
51+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.stateful.config.ts
52+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts
53+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.ai_assistant.stateful.config.ts
54+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/stateful/oblt.stateful.config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ disabled:
22
# Stateful base config for deployment-agnostic tests
33
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/stateful.config.base.ts
44
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
5-
- x-pack/test/api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
6-
- x-pack/test/api_integration/deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
75

86
# Base config files, only necessary to inform config finding script
97
- src/platform/test/functional/config.base.js

.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ agents:
1515
machineType: n2-standard-2
1616

1717
steps:
18-
- label: "Annotate runtime parameters"
18+
- label: 'Annotate runtime parameters'
1919
command: .buildkite/scripts/steps/es_serverless/annotate_runtime_parameters.sh
2020

21-
- group: "(:kibana: x :elastic:) Trigger Kibana Serverless suite"
21+
- group: '(:kibana: x :elastic:) Trigger Kibana Serverless suite'
2222
if: "build.env('SKIP_VERIFICATION') != '1' && build.env('SKIP_VERIFICATION') != 'true'"
2323
steps:
24-
- label: "Pre-Build"
24+
- label: 'Pre-Build'
2525
command: .buildkite/scripts/lifecycle/pre_build.sh
2626
key: pre-build
2727
timeout_in_minutes: 10
@@ -31,7 +31,7 @@ steps:
3131
provider: gcp
3232
machineType: n2-standard-2
3333

34-
- label: "Build Kibana Distribution"
34+
- label: 'Build Kibana Distribution'
3535
command: .buildkite/scripts/steps/build_kibana.sh
3636
agents:
3737
image: family/kibana-ubuntu-2004
@@ -44,26 +44,26 @@ steps:
4444
timeout_in_minutes: 60
4545
retry:
4646
automatic:
47-
- exit_status: "-1"
47+
- exit_status: '-1'
4848
limit: 3
4949

50-
- label: "Pick Test Group Run Order (FTR + Integration)"
50+
- label: 'Pick Test Group Run Order (FTR + Integration)'
5151
command: .buildkite/scripts/steps/test/pick_test_group_run_order.sh
5252
depends_on: build
5353
timeout_in_minutes: 10
5454
env:
55-
FTR_CONFIGS_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh"
56-
JEST_INTEGRATION_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh"
57-
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/test/api_integration/deployment_agnostic/configs/serverless/**,x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/**"
58-
FTR_EXTRA_ARGS: "$FTR_EXTRA_ARGS"
59-
LIMIT_CONFIG_TYPE: "functional,integration"
55+
FTR_CONFIGS_SCRIPT: 'TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh'
56+
JEST_INTEGRATION_SCRIPT: 'TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh'
57+
FTR_CONFIG_PATTERNS: '**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/**,x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/**'
58+
FTR_EXTRA_ARGS: '$FTR_EXTRA_ARGS'
59+
LIMIT_CONFIG_TYPE: 'functional,integration'
6060
retry:
6161
automatic:
62-
- exit_status: "*"
62+
- exit_status: '*'
6363
limit: 1
6464

6565
- command: .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh
66-
label: "Serverless Entity Analytics - Security Solution Cypress Tests"
66+
label: 'Serverless Entity Analytics - Security Solution Cypress Tests'
6767
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
6868
agents:
6969
image: family/kibana-ubuntu-2004
@@ -76,11 +76,11 @@ steps:
7676
parallelism: 3
7777
retry:
7878
automatic:
79-
- exit_status: "-1"
79+
- exit_status: '-1'
8080
limit: 1
8181

8282
- command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
83-
label: "Serverless Explore - Security Solution Cypress Tests"
83+
label: 'Serverless Explore - Security Solution Cypress Tests'
8484
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
8585
agents:
8686
image: family/kibana-ubuntu-2004
@@ -93,11 +93,11 @@ steps:
9393
parallelism: 4
9494
retry:
9595
automatic:
96-
- exit_status: "-1"
96+
- exit_status: '-1'
9797
limit: 1
9898

9999
- command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
100-
label: "Serverless Investigations - Security Solution Cypress Tests"
100+
label: 'Serverless Investigations - Security Solution Cypress Tests'
101101
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
102102
agents:
103103
image: family/kibana-ubuntu-2004
@@ -110,11 +110,11 @@ steps:
110110
parallelism: 10
111111
retry:
112112
automatic:
113-
- exit_status: "-1"
113+
- exit_status: '-1'
114114
limit: 1
115115

116116
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management.sh
117-
label: "Serverless Rule Management - Security Solution Cypress Tests"
117+
label: 'Serverless Rule Management - Security Solution Cypress Tests'
118118
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
119119
agents:
120120
image: family/kibana-ubuntu-2004
@@ -127,11 +127,11 @@ steps:
127127
parallelism: 5
128128
retry:
129129
automatic:
130-
- exit_status: "-1"
130+
- exit_status: '-1'
131131
limit: 1
132132

133133
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
134-
label: "Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests"
134+
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
135135
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
136136
agents:
137137
image: family/kibana-ubuntu-2004
@@ -144,11 +144,11 @@ steps:
144144
parallelism: 1
145145
retry:
146146
automatic:
147-
- exit_status: "-1"
147+
- exit_status: '-1'
148148
limit: 1
149149

150150
- command: .buildkite/scripts/steps/functional/security_serverless_detection_engine.sh
151-
label: "Serverless Detection Engine - Security Solution Cypress Tests"
151+
label: 'Serverless Detection Engine - Security Solution Cypress Tests'
152152
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
153153
agents:
154154
image: family/kibana-ubuntu-2004
@@ -161,11 +161,11 @@ steps:
161161
parallelism: 5
162162
retry:
163163
automatic:
164-
- exit_status: "-1"
164+
- exit_status: '-1'
165165
limit: 1
166166

167167
- command: .buildkite/scripts/steps/functional/security_serverless_detection_engine_exceptions.sh
168-
label: "Serverless Detection Engine - Exceptions - Security Solution Cypress Tests"
168+
label: 'Serverless Detection Engine - Exceptions - Security Solution Cypress Tests'
169169
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
170170
agents:
171171
image: family/kibana-ubuntu-2004
@@ -178,11 +178,11 @@ steps:
178178
parallelism: 4
179179
retry:
180180
automatic:
181-
- exit_status: "-1"
181+
- exit_status: '-1'
182182
limit: 1
183183

184184
- command: .buildkite/scripts/steps/functional/security_serverless_ai_assistant.sh
185-
label: "Serverless AI Assistant - Security Solution Cypress Tests"
185+
label: 'Serverless AI Assistant - Security Solution Cypress Tests'
186186
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
187187
agents:
188188
image: family/kibana-ubuntu-2004
@@ -195,11 +195,11 @@ steps:
195195
parallelism: 1
196196
retry:
197197
automatic:
198-
- exit_status: "-1"
198+
- exit_status: '-1'
199199
limit: 1
200200

201201
- command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
202-
label: "Defend Workflows Cypress Tests on Serverless"
202+
label: 'Defend Workflows Cypress Tests on Serverless'
203203
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
204204
agents:
205205
image: family/kibana-ubuntu-2004
@@ -212,11 +212,11 @@ steps:
212212
parallelism: 12
213213
retry:
214214
automatic:
215-
- exit_status: "-1"
215+
- exit_status: '-1'
216216
limit: 1
217217

218218
- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
219-
label: "Osquery Cypress Tests on Serverless"
219+
label: 'Osquery Cypress Tests on Serverless'
220220
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
221221
agents:
222222
image: family/kibana-ubuntu-2004
@@ -229,16 +229,16 @@ steps:
229229
parallelism: 7
230230
retry:
231231
automatic:
232-
- exit_status: "-1"
232+
- exit_status: '-1'
233233
limit: 1
234234

235235
- wait: ~
236236

237-
- label: ":arrow_up::elastic::arrow_up: Promote docker image"
237+
- label: ':arrow_up::elastic::arrow_up: Promote docker image'
238238
command: .buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh $ES_SERVERLESS_IMAGE
239239

240240
- wait: ~
241241

242-
- label: "Post-Build"
242+
- label: 'Post-Build'
243243
command: .buildkite/scripts/lifecycle/post_build.sh
244244
timeout_in_minutes: 10

.eslintrc.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,9 +779,10 @@ module.exports = {
779779
'x-pack/platform/test/*/{tests,test_suites,apis,apps}/**/*',
780780
'x-pack/platform/test/*api_integration*/**/*',
781781
'x-pack/platform/test/*/*config.*ts',
782-
'x-pack/solutions/*/test/**/{tests,test_suites,apis,apps,deployment_agnostic,fixtures}/**/*',
782+
'x-pack/solutions/*/test/**/{tests,test_suites,apis,apps,fixtures}/**/*',
783+
'x-pack/solutions/*/test/*api_integration*/**/*',
783784
'x-pack/solutions/*/test/**/*config.*ts',
784-
'x-pack/test/*/{tests,test_suites,apis,apps,deployment_agnostic}/**/*',
785+
'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
785786
'x-pack/test/*/*config.*ts',
786787
'x-pack/platform/test/saved_object_api_integration/*/apis/**/*',
787788
'x-pack/platform/test/ui_capabilities/*/tests/**/*',

0 commit comments

Comments
 (0)