Skip to content

Commit

Permalink
Merge branch 'main' into memory-usage-functional-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbrtj
rbrtj authored Oct 25, 2024
2 parents aa617d5 + dc2d8e4 commit 44bfd37
Show file tree
Hide file tree
Showing 2,085 changed files with 32,261 additions and 131,919 deletions.
2 changes: 1 addition & 1 deletion .buildkite/ftr_platform_stateful_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ enabled:
- x-pack/test/task_manager_claimer_mget/config.ts
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
- x-pack/test/ui_capabilities/spaces_only/config.ts
- x-pack/test/upgrade_assistant_integration/config.js
- x-pack/test/upgrade_assistant_integration/config.ts
- x-pack/test/usage_collection/config.ts
- x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
- x-pack/performance/journeys_e2e/ecommerce_dashboard.ts
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/ftr_security_serverless_configs.yml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
disabled:
# Base config files, only necessary to inform config finding script
- x-pack/test_serverless/functional/test_suites/security/cypress/security_config.base.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
- x-pack/test/security_solution_api_integration/config/serverless/config.base.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/defend_workflows_cypress/serverless_config.base.ts
- x-pack/test/osquery_cypress/serverless_config.base.ts

# Cypress configs, for now these are still run manually
- x-pack/test/defend_workflows_cypress/serverless_config.ts
- x-pack/test/osquery_cypress/serverless_cli_config.ts
- x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
- x-pack/test/security_solution_cypress/serverless_config.ts


# Playwright
- x-pack/test/security_solution_playwright/serverless_config.ts

Expand Down
4 changes: 4 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ spec:
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '8.x'
Daily build (8.16):
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '8.16'
Daily build (8.15):
cronline: 0 22 * * * America/New_York
message: Daily build
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/chrome_forward_testing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
machineType: n2-standard-4
preemptible: true
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: "Serverless Osquery Cypress Tests"
label: "Osquery Cypress Tests on Serverless"
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
image: family/kibana-ubuntu-2004
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/on_merge.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/pointer_compression.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
Expand Down
14 changes: 1 addition & 13 deletions .buildkite/pipelines/pull_request/security_solution/defend_workflows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,4 @@ steps:
retry:
automatic:
- exit_status: '-1'
limit: 1
# status_exception: Native role management is not enabled in this Elasticsearch instance
# - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
# label: 'Serverless Security Defend Workflows Cypress Tests'
# agents:
# machineType: n2-standard-4
# preemptible: true
# depends_on: build
# timeout_in_minutes: 60
# retry:
# automatic:
# - exit_status: '-1'
# limit: 1
limit: 1
2 changes: 1 addition & 1 deletion .buildkite/pipelines/pull_request/security_solution/osquery_cypress.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
label: 'Serverless Osquery Cypress Tests'
label: 'Osquery Cypress Tests on Serverless'
agents:
machineType: n2-standard-4
preemptible: true
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/scripts/steps/checks.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ fi
.buildkite/scripts/steps/checks/saved_objects_definition_change.sh
.buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
.buildkite/scripts/steps/code_generation/osquery_codegen.sh
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
3 changes: 3 additions & 0 deletions .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ run_check() {
retry 5 15 run_check

check_for_changed_files "$cmd" true

.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
12 changes: 0 additions & 12 deletions .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
View file

This file was deleted.

3 changes: 1 addition & 2 deletions .buildkite/scripts/steps/openapi_bundling/final_merge.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ source .buildkite/scripts/common/util.sh
echo --- Merge Kibana OpenAPI specs

(cd oas_docs && make api-docs && make api-docs-lint)
(cd oas_docs && make api-docs-staging && make api-docs-lint)

check_for_changed_files "make api-docs && make api-docs-staging" true
check_for_changed_files "make api-docs" true
1 change: 1 addition & 0 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,7 @@ module.exports = {
'x-pack/test/*/*config.*ts',
'x-pack/test/saved_object_api_integration/*/apis/**/*',
'x-pack/test/ui_capabilities/*/tests/**/*',
'x-pack/test/upgrade_assistant_integration/**/*',
'x-pack/test/performance/**/*.ts',
'**/cypress.config.{js,ts}',
'x-pack/test_serverless/**/config*.ts',
Expand Down
Loading

0 comments on commit 44bfd37

Please sign in to comment.