Skip to content

Commit 555ea07

Browse files
patrykkopycinskipatrykkopycinski
authored
Merge branch 'main' into fix-attack-discovery-utils
2 parents 251e2e4 + 5e8188a commit 555ea07

3,819 files changed

Lines changed: 118621 additions & 46977 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: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
disabled:
22
# Cypress configs, for now these are still run manually
3+
- x-pack/test/apm_cypress/cli_config.ts
34
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_open.ts
45
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_runner.ts
56
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config.ts
6-
- x-pack/solutions/observability/plugins/apm/ftr_e2e/ftr_config_run.ts
7-
- x-pack/solutions/observability/plugins/apm/ftr_e2e/ftr_config.ts
87
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config_run.ts
98
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config.ts
10-
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_open.ts
11-
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_runner.ts
12-
- x-pack/solutions/observability/plugins/profiling/e2e/ftr_config.ts
13-
9+
- x-pack/test/profiling_cypress/cli_config.ts
1410
#FTR configs
1511
- x-pack/solutions/observability/plugins/uptime/e2e/config.ts
1612

@@ -32,7 +28,6 @@ enabled:
3228
- x-pack/test/api_integration/apis/synthetics/config.ts
3329
- x-pack/test/api_integration/apis/uptime/config.ts
3430
- x-pack/test/api_integration/apis/entity_manager/config.ts
35-
- x-pack/test/api_integration/apis/streams/config.ts
3631
- x-pack/test/apm_api_integration/basic/config.ts
3732
- x-pack/test/apm_api_integration/cloud/config.ts
3833
- x-pack/test/apm_api_integration/rules/config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ enabled:
121121
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/resolver/trial_license_complete_tier/configs/serverless.config.ts
122122
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/response_actions/trial_license_complete_tier/configs/serverless.config.ts
123123
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/spaces/trial_license_complete_tier/configs/serverless.config.ts
124+
- x-pack/test/security_solution_api_integration/test_suites/siem_migrations/rules/trial_license_complete_tier/configs/serverless.config.ts
124125
- x-pack/test/security_solution_endpoint/configs/serverless.endpoint.config.ts
125126
- x-pack/test/security_solution_endpoint/configs/serverless.integrations.config.ts
126127
# serverless config files that run deployment-agnostic tests

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ enabled:
9595
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/resolver/trial_license_complete_tier/configs/ess.config.ts
9696
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/response_actions/trial_license_complete_tier/configs/ess.config.ts
9797
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/spaces/trial_license_complete_tier/configs/ess.config.ts
98+
- x-pack/test/security_solution_api_integration/test_suites/siem_migrations/rules/trial_license_complete_tier/configs/ess.config.ts
9899
- x-pack/test/security_solution_endpoint/configs/endpoint.config.ts
99100
- x-pack/test/security_solution_endpoint/configs/integrations.config.ts
100101
- x-pack/test/api_integration/apis/cloud_security_posture/config.ts
@@ -104,3 +105,4 @@ enabled:
104105
- x-pack/test/cloud_security_posture_functional/data_views/config.ts
105106
- x-pack/test/automatic_import_api_integration/apis/config_basic.ts
106107
- x-pack/test/automatic_import_api_integration/apis/config_graphs.ts
108+
- x-pack/test/security_solution_api_integration/test_suites/asset_inventory/entity_store/trial_license_complete_tier/configs/ess.config.ts

‎.buildkite/package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.buildkite/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"devDependencies": {
2121
"@types/chai": "^4.3.3",
22-
"@types/js-yaml": "^4.0.5",
22+
"@types/js-yaml": "^4.0.9",
2323
"@types/minimatch": "^3.0.5",
2424
"@types/mocha": "^10.0.1",
2525
"@types/node": "^15.12.2",

‎.buildkite/pipeline-resource-definitions/kibana-pointer-compression.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ spec:
2727
pipeline_file: ".buildkite/pipelines/pointer_compression.yml"
2828
provider_settings:
2929
trigger_mode: none
30-
schedules:
31-
Daily run:
32-
branch: main
33-
cronline: "@daily"
3430
teams:
3531
kibana-operations:
3632
access_level: MANAGE_BUILD_AND_READ

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,38 @@ steps:
479479
- exit_status: '-1'
480480
limit: 1
481481

482+
- command: .buildkite/scripts/steps/functional/profiling_cypress.sh
483+
label: 'Profiling Cypress Tests'
484+
agents:
485+
image: family/kibana-ubuntu-2004
486+
imageProject: elastic-images-prod
487+
provider: gcp
488+
machineType: n2-standard-4
489+
preemptible: true
490+
depends_on: build
491+
timeout_in_minutes: 120
492+
parallelism: 3
493+
retry:
494+
automatic:
495+
- exit_status: '-1'
496+
limit: 1
497+
498+
- command: .buildkite/scripts/steps/functional/apm_cypress.sh
499+
label: 'APM Cypress Tests'
500+
agents:
501+
image: family/kibana-ubuntu-2004
502+
imageProject: elastic-images-prod
503+
provider: gcp
504+
machineType: n2-standard-4
505+
preemptible: true
506+
depends_on: build
507+
timeout_in_minutes: 120
508+
parallelism: 3
509+
retry:
510+
automatic:
511+
- exit_status: '-1'
512+
limit: 1
513+
482514
- command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
483515
label: Trigger unsupported ftr tests
484516
timeout_in_minutes: 10

‎.buildkite/pipelines/on_merge_unsupported_ftrs.yml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,44 +28,6 @@ steps:
2828
- exit_status: '-1'
2929
limit: 3
3030

31-
- command: .buildkite/scripts/steps/functional/apm_cypress.sh
32-
label: 'APM Cypress Tests'
33-
agents:
34-
image: family/kibana-ubuntu-2004
35-
imageProject: elastic-images-prod
36-
provider: gcp
37-
machineType: n2-standard-4
38-
preemptible: true
39-
depends_on: build
40-
env:
41-
PING_SLACK_TEAM: "@obs-ux-infra_services-team"
42-
timeout_in_minutes: 120
43-
retry:
44-
automatic:
45-
- exit_status: '-1'
46-
limit: 3
47-
- exit_status: '*'
48-
limit: 1
49-
50-
- command: .buildkite/scripts/steps/functional/profiling_cypress.sh
51-
label: 'Profiling Cypress Tests'
52-
agents:
53-
image: family/kibana-ubuntu-2004
54-
imageProject: elastic-images-prod
55-
provider: gcp
56-
machineType: n2-standard-4
57-
preemptible: true
58-
depends_on: build
59-
env:
60-
PING_SLACK_TEAM: "@obs-ux-infra_services-team"
61-
timeout_in_minutes: 120
62-
retry:
63-
automatic:
64-
- exit_status: '-1'
65-
limit: 3
66-
- exit_status: '*'
67-
limit: 1
68-
6931
- command: .buildkite/scripts/steps/functional/synthetics_plugin.sh
7032
label: 'Synthetics @elastic/synthetics Tests'
7133
agents:

‎.buildkite/pipelines/pull_request/apm_cypress.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
- check_types
1414
- check_oas_snapshot
1515
timeout_in_minutes: 120
16-
parallelism: 1 # TODO: Set parallelism when apm_cypress handles it
16+
parallelism: 3
1717
retry:
1818
automatic:
1919
- exit_status: '-1'

‎.buildkite/pipelines/pull_request/profiling_cypress.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
- check_types
1414
- check_oas_snapshot
1515
timeout_in_minutes: 120
16-
parallelism: 2
16+
parallelism: 3
1717
retry:
1818
automatic:
1919
- exit_status: '-1'

0 commit comments

Comments
 (0)