Skip to content

Commit

Permalink
Merge branch '8.16' into backport/8.16/pr-196969
Browse files Browse the repository at this point in the history
  • Loading branch information
smith authored Oct 31, 2024
2 parents 061e166 + f02d130 commit 67460d2
Show file tree
Hide file tree
Showing 311 changed files with 3,432 additions and 1,763 deletions.
84 changes: 54 additions & 30 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,36 @@ steps:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/lint.sh
label: 'Linting'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
preemptible: true
key: linting
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/lint_with_types.sh
label: 'Linting (with types)'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-32
preemptible: true
key: linting_with_types
timeout_in_minutes: 90
retry:
automatic:
- exit_status: '-1'
limit: 3

- wait

- command: .buildkite/scripts/steps/on_merge_api_docs.sh
Expand Down Expand Up @@ -109,6 +139,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -127,6 +159,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 4
retry:
Expand All @@ -145,6 +179,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -163,6 +199,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 5
retry:
Expand All @@ -181,6 +219,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -199,6 +239,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -217,6 +259,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -235,6 +279,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -253,6 +299,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -271,6 +319,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 8
retry:
Expand All @@ -291,6 +341,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 20
retry:
Expand All @@ -304,42 +356,14 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-2

- command: .buildkite/scripts/steps/lint.sh
label: 'Linting'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-8
preemptible: true
key: linting
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/lint_with_types.sh
label: 'Linting (with types)'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-16
preemptible: true
key: linting_with_types
timeout_in_minutes: 90
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/checks.sh
label: 'Checks'
agents:
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/apm_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 120
parallelism: 1 # TODO: Set parallelism when apm_cypress handles it
retry:
Expand Down
48 changes: 24 additions & 24 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,30 @@ steps:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/lint.sh
label: 'Linting'
agents:
machineType: n2-standard-16
preemptible: true
key: linting
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/lint_with_types.sh
label: 'Linting (with types)'
agents:
machineType: n2-standard-32
preemptible: true
key: linting_with_types
timeout_in_minutes: 90
retry:
automatic:
- exit_status: '-1'
limit: 3

- wait

- command: .buildkite/scripts/steps/ci_stats_ready.sh
Expand Down Expand Up @@ -61,18 +85,6 @@ steps:
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/lint.sh
label: 'Linting'
agents:
machineType: n2-standard-8
preemptible: true
key: linting
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/check_types.sh
label: 'Check Types'
agents:
Expand All @@ -85,18 +97,6 @@ steps:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/lint_with_types.sh
label: 'Linting (with types)'
agents:
machineType: n2-standard-16
preemptible: true
key: linting_with_types
timeout_in_minutes: 90
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/checks.sh
label: 'Checks'
key: checks
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/deploy_cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 30
soft_fail: true
retry:
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/exploratory_view_plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
artifact_paths:
- 'x-pack/plugins/observability_solution/exploratory_view/e2e/.journeys/**/*'
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/fips.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
soft_fail: true
retry:
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/fleet_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 50
parallelism: 6
retry:
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/kbn_handlebars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 5
retry:
automatic:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 120
retry:
automatic:
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/profiling_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 120
parallelism: 2
retry:
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/response_ops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 120
parallelism: 9
retry:
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/pull_request/response_ops_cases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 120
retry:
automatic:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -22,6 +24,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
soft_fail: true
parallelism: 1
Expand All @@ -23,6 +25,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -37,6 +41,8 @@ steps:
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 50
soft_fail: true
retry:
Expand Down
Loading

0 comments on commit 67460d2

Please sign in to comment.