Skip to content

Commit

Permalink
Merge branch 'main' of github.com:elastic/kibana into 196142-adjust-t…
Browse files Browse the repository at this point in the history
…ypes
  • Loading branch information
crespocarlos committed Nov 8, 2024
2 parents b046148 + fcc3b06 commit 3f06d21
Show file tree
Hide file tree
Showing 2,138 changed files with 43,350 additions and 27,298 deletions.
4 changes: 3 additions & 1 deletion .buildkite/ftr_security_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ disabled:
- x-pack/test/osquery_cypress/serverless_cli_config.ts
- x-pack/test/security_solution_cypress/serverless_config.ts


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

Expand Down Expand Up @@ -93,6 +92,9 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/configs/serverless.config.ts
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/chrome_forward_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ steps:
- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
timeout_in_minutes: 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ steps:
provider: gcp
machineType: n2-standard-2

- label: "Build Kibana Distribution and Plugins"
- label: "Build Kibana Distribution"
command: .buildkite/scripts/steps/build_kibana.sh
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
depends_on: pre-build
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/es_snapshots/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ steps:
- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/fips.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ steps:
- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/flaky_tests/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const pipeline = {

steps.push({
command: '.buildkite/scripts/steps/build_kibana.sh',
label: 'Build Kibana Distribution and Plugins',
label: 'Build Kibana Distribution',
agents: expandAgentQueue('c2-8'),
key: 'build',
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''",
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ steps:
- wait

- command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
timeout_in_minutes: 60
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/on_merge_unsupported_ftrs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ steps:
limit: 1

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/performance/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ steps:

- wait

- label: '🧑‍🏭 Build Kibana Distribution and Plugins'
- label: '🧑‍🏭 Build Kibana Distribution'
command: .buildkite/scripts/steps/build_kibana.sh
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: c2-standard-16
machineType: n2-standard-8
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ steps:

- wait

- label: ':building_construction: Build Kibana Distribution and Plugins'
- label: ':building_construction: Build Kibana Distribution '
command: .buildkite/scripts/steps/build_kibana.sh
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: c2-standard-16
machineType: n2-standard-8
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"

Expand Down
4 changes: 2 additions & 2 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ steps:
- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
label: Build Kibana Distribution
agents:
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ steps:

- wait

- label: 'Build Kibana Distribution and Plugins'
- label: 'Build Kibana Distribution'
command: .buildkite/scripts/steps/build_kibana.sh
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
machineType: n2-standard-8
preemptible: true
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,51 @@ steps:
- exit_status: '1'
limit: 2

- label: Running exception_lists:auth:lists:qa:serverless
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:lists:qa:serverless
key: exception_lists:auth:lists:qa:serverless
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '1'
limit: 2

- label: Running exception_lists:auth:common:qa:serverless
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:common:qa:serverless
key: exception_lists:auth:common:qa:serverless
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '1'
limit: 2

- label: Running exception_lists:auth:items:qa:serverless
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:items:qa:serverless
key: exception_lists:auth:items:qa:serverless
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '1'
limit: 2

- label: Running lists_items:qa:serverless
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh lists_items:qa:serverless
key: lists_items:qa:serverless
Expand Down
Loading

0 comments on commit 3f06d21

Please sign in to comment.