Skip to content

Commit 4c6e715

Browse files
maximpnmaximpn
authored
Merge branch 'main' into revert-base-version-test-plan
2 parents 31d8674 + cc6a2a9 commit 4c6e715

4,634 files changed

Lines changed: 104944 additions & 71343 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_platform_stateful_configs.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ disabled:
3030
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts
3131
- x-pack/platform/test/alerting_api_integration/spaces_only_legacy/config.ts
3232
- x-pack/test/cloud_integration/config.ts
33-
- x-pack/test/load/config.ts
34-
- x-pack/test/plugin_api_perf/config.js
33+
- x-pack/platform/test/load/config.ts
34+
- x-pack/platform/test/plugin_api_perf/config.ts
3535
- x-pack/test/screenshot_creation/config.ts
36-
- x-pack/test/fleet_packages/config.ts
36+
- x-pack/platform/test/fleet_packages/config.ts
3737

3838
# Scalability testing config that we run in its own pipeline
39-
- x-pack/test/scalability/config.ts
39+
- x-pack/platform/test/scalability/config.ts
4040

4141
# Cypress configs, for now these are still run manually
4242
- x-pack/test/fleet_cypress/cli_config.ts
@@ -158,11 +158,11 @@ enabled:
158158
- x-pack/test/api_integration/apis/cases/config.ts
159159
- x-pack/test/api_integration/apis/security/config.ts
160160
- x-pack/test/banners_functional/config.ts
161-
- x-pack/test/cases_api_integration/security_and_spaces/config_basic.ts
162-
- x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts
163-
- x-pack/test/cases_api_integration/security_and_spaces/config_trial_common.ts
164-
- x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
165-
- x-pack/test/cases_api_integration/spaces_only/config.ts
161+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_basic.ts
162+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial.ts
163+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial_common.ts
164+
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
165+
- x-pack/platform/test/cases_api_integration/spaces_only/config.ts
166166
- x-pack/test/disable_ems/config.ts
167167
- x-pack/test/examples/config.ts
168168
- x-pack/test/fleet_api_integration/config.agent.ts
@@ -173,8 +173,8 @@ enabled:
173173
- x-pack/test/fleet_api_integration/config.package_policy.ts
174174
- x-pack/test/fleet_api_integration/config.space_awareness.ts
175175
- x-pack/test/fleet_functional/config.ts
176-
- x-pack/test/fleet_tasks/config.ts
177-
- x-pack/test/ftr_apis/security_and_spaces/config.ts
176+
- x-pack/platform/test/fleet_tasks/config.ts
177+
- x-pack/platform/test/ftr_apis/security_and_spaces/config.ts
178178
- x-pack/test/functional_basic/apps/ml/permissions/config.ts
179179
- x-pack/test/functional_basic/apps/ml/data_visualizer/group1/config.ts
180180
- x-pack/test/functional_basic/apps/ml/data_visualizer/group2/config.ts
@@ -330,7 +330,7 @@ enabled:
330330
- x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
331331
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
332332
- x-pack/test/spaces_api_integration/spaces_only/config.ts
333-
- x-pack/test/task_manager_claimer_update_by_query/config.ts
333+
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
334334
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
335335
- x-pack/test/ui_capabilities/spaces_only/config.ts
336336
- x-pack/test/upgrade_assistant_integration/config.ts
@@ -378,6 +378,7 @@ enabled:
378378
- x-pack/platform/test/api_integration/apis/management/config.ts
379379
- x-pack/platform/test/api_integration/apis/management/index_management/disabled_data_enrichers/config.ts
380380
- x-pack/platform/test/api_integration/apis/maps/config.ts
381+
- x-pack/platform/test/api_integration/apis/lens/config.ts
381382
- x-pack/platform/test/api_integration/apis/ml/config.ts
382383
- x-pack/platform/test/api_integration/apis/monitoring/config.ts
383384
- x-pack/platform/test/api_integration/apis/monitoring_collection/config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ disabled:
55
- x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
66
- x-pack/test/security_solution_api_integration/config/serverless/config.base.ai4dsoc.ts
77
- x-pack/test/defend_workflows_cypress/serverless_config.base.ts
8-
- x-pack/test/osquery_cypress/serverless_config.base.ts
8+
- x-pack/solutions/security/test/osquery_cypress/serverless_config.base.ts
99

1010
# Cypress configs, for now these are still run manually
1111
- x-pack/test/defend_workflows_cypress/serverless_config.ts
12-
- x-pack/test/osquery_cypress/serverless_cli_config.ts
12+
- x-pack/solutions/security/test/osquery_cypress/serverless_cli_config.ts
1313
- x-pack/test/security_solution_cypress/serverless_config.ts
1414
- x-pack/test/security_solution_cypress/ai4dsoc_serverless_config.ts
1515

@@ -76,6 +76,7 @@ enabled:
7676
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/configs/serverless.config.ts
7777
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/configs/serverless.config.ts
7878
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/configs/serverless.config.ts
79+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/serverless_essentials_tier.config.ts
7980
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_disabled/configs/serverless_essentials_tier.config.ts
8081
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts
8182
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ disabled:
1717
# Cypress configs, for now these are still run manually
1818
- x-pack/test/defend_workflows_cypress/cli_config.ts
1919
- x-pack/test/defend_workflows_cypress/config.ts
20-
- x-pack/test/osquery_cypress/cli_config.ts
21-
- x-pack/test/osquery_cypress/config.ts
22-
- x-pack/test/osquery_cypress/visual_config.ts
20+
- x-pack/solutions/security/test/osquery_cypress/cli_config.ts
21+
- x-pack/solutions/security/test/osquery_cypress/config.ts
22+
- x-pack/solutions/security/test/osquery_cypress/visual_config.ts
2323
- x-pack/test/security_solution_cypress/cli_config.ts
2424
- x-pack/test/security_solution_cypress/config.ts
2525

@@ -60,6 +60,8 @@ enabled:
6060
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/configs/ess.config.ts
6161
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/configs/ess.config.ts
6262
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/configs/ess.config.ts
63+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/ess_basic_license.config.ts
64+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/ess_air_gapped.config.ts
6365
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_disabled/configs/ess_basic_license.config.ts
6466
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts
6567
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/ess.config.ts
@@ -121,3 +123,5 @@ enabled:
121123
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group1/config.ts
122124
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config.ts
123125
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
126+
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial.ts
127+
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts

‎.buildkite/pipeline-resource-definitions/kibana-renovate-helper.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
2+
apiVersion: backstage.io/v1alpha1
3+
kind: Resource
4+
metadata:
5+
name: bk-kibana-renovate-helper
6+
description: 'Run scripts and trigger CI for Kibana Renovate PRs'
7+
links:
8+
- url: 'https://buildkite.com/elastic/kibana-renovate-helper'
9+
title: Pipeline link
10+
spec:
11+
type: buildkite-pipeline
12+
system: buildkite
13+
owner: 'group:kibana-operations'
14+
implementation:
15+
apiVersion: buildkite.elastic.dev/v1
16+
kind: Pipeline
17+
metadata:
18+
name: kibana / renovate helper
19+
description: 'Run scripts and trigger CI for Kibana Renovate PRs'
20+
spec:
21+
env:
22+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
23+
24+
allow_rebuilds: true
25+
branch_configuration: main
26+
default_branch: main
27+
repository: elastic/kibana
28+
pipeline_file: .buildkite/pipelines/renovate_helper.yml
29+
cancel_intermediate_builds: true
30+
provider_settings:
31+
build_pull_requests: true
32+
prefix_pull_request_fork_branch_names: false
33+
skip_pull_request_builds_for_existing_commits: true
34+
trigger_mode: none
35+
teams:
36+
kibana-operations:
37+
access_level: MANAGE_BUILD_AND_READ
38+
kibana-security:
39+
access_level: MANAGE_BUILD_AND_READ
40+
kibana-tech-leads:
41+
access_level: MANAGE_BUILD_AND_READ
42+
everyone:
43+
access_level: BUILD_AND_READ
44+
tags:
45+
- kibana

‎.buildkite/pipeline-resource-definitions/locations.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ spec:
3838
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pointer-compression.yml
3939
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pr.yml
4040
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-purge-cloud-deployments.yml
41+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-renovate-helper.yml
4142
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-emergency-release.yml
4243
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates-emergency.yml
4344
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates.yml

‎.buildkite/pipelines/flaky_tests/groups.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@
9292
"key": "cypress/profiling_cypress",
9393
"name": "Profiling - Cypress"
9494
},
95-
{
96-
"key": "cypress/inventory_cypress",
97-
"name": "Inventory - Cypress"
98-
},
9995
{
10096
"key": "cypress/cloud_security_posture",
10197
"name": "Cloud Security Posture - Cypress"

‎.buildkite/pipelines/on_merge_unsupported_ftrs.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,6 @@ steps:
4949
- exit_status: '*'
5050
limit: 1
5151

52-
- command: .buildkite/scripts/steps/functional/inventory_cypress.sh
53-
label: 'Inventory Cypress Tests'
54-
agents:
55-
image: family/kibana-ubuntu-2004
56-
imageProject: elastic-images-prod
57-
provider: gcp
58-
machineType: n2-standard-4
59-
preemptible: true
60-
depends_on: build
61-
env:
62-
PING_SLACK_TEAM: "@obs-ux-infra_services-team"
63-
timeout_in_minutes: 120
64-
retry:
65-
automatic:
66-
- exit_status: '-1'
67-
limit: 3
68-
- exit_status: '*'
69-
limit: 1
70-
7152
- command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
7253
label: 'Scout Test Run Builder'
7354
agents:

‎.buildkite/pipelines/pull_request/inventory_cypress.yml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.buildkite/pipelines/renovate_helper.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
agents:
2+
provider: gcp
3+
image: family/kibana-ubuntu-2004
4+
imageProject: elastic-images-prod
5+
machineType: n2-standard-2
6+
steps:
7+
- group: 'Renovate PR opened or comment'
8+
if: >-
9+
"(build.env('GITHUB_PR_USER') == 'elastic-renovate-prod[bot]' && build.env('GITHUB_PR_EVENT_TYPE') == 'pull_request' && build.env('GITHUB_PR_EVENT_ACTION') == 'opened')
10+
|| (build.env('GITHUB_PR_EVENT_TYPE') == 'issue_comment' && build.env('GITHUB_PR_EVENT_ACTION') == 'created')"
11+
12+
steps:
13+
- command: .buildkite/scripts/steps/renovate/renovate_helper.sh
14+
label: 'Run Renovate helper on PR opened or comment'
15+
key: renovate_helper
16+
timeout_in_minutes: 20
17+
retry:
18+
automatic:
19+
- exit_status: '*'
20+
limit: 1
21+
22+
- wait: ~
23+
24+
- command: .buildkite/scripts/steps/renovate/trigger_pr.sh
25+
label: 'Trigger Kibana PR pipeline on PR opened or comment'
26+
key: trigger_pr_opened
27+
timeout_in_minutes: 10
28+
retry:
29+
automatic:
30+
- exit_status: '*'
31+
limit: 1
32+
33+
- group: 'Renovate PR updated'
34+
# GITHUB_PR_USER is the PR author and GITHUB_PR_TRIGGER_USER is the commit author
35+
if: >-
36+
"build.env('GITHUB_PR_USER') == 'elastic-renovate-prod[bot]'
37+
&& build.env('GITHUB_PR_TRIGGER_USER') != 'elastic-renovate-prod[bot]'
38+
&& build.env('GITHUB_PR_EVENT_TYPE') == 'pull_request'
39+
&& build.env('GITHUB_PR_EVENT_ACTION') == 'synchronize'"
40+
41+
steps:
42+
- command: .buildkite/scripts/steps/renovate/trigger_pr.sh
43+
label: 'Trigger Kibana PR pipeline on PR updated'
44+
key: trigger_pr_updated
45+
timeout_in_minutes: 10
46+
retry:
47+
automatic:
48+
- exit_status: '*'
49+
limit: 1

‎.buildkite/pull_requests.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,21 @@
104104
"/__snapshots__/",
105105
"\\.test\\.(ts|tsx|js|jsx)"
106106
]
107+
},
108+
{
109+
"repoOwner": "elastic",
110+
"repoName": "kibana",
111+
"pipelineSlug": "kibana-renovate-helper",
112+
"skip_ci_labels": [],
113+
"enabled": true,
114+
"allow_org_users": true,
115+
"allowed_repo_permissions": ["admin", "write"],
116+
"allowed_list": ["elastic-vault-github-plugin-prod[bot]"],
117+
"build_on_commit": false,
118+
"build_on_comment": true,
119+
"build_drafts": false,
120+
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:run)\\W+(?:renovate)\\W+(?:helper))$",
121+
"kibana_versions_check": true
107122
}
108123
]
109124
}

0 commit comments

Comments
 (0)