Skip to content

Commit

Permalink
Merge branch '8.16' into backport/8.16/commit-e53d68c2
Browse files Browse the repository at this point in the history
  • Loading branch information
lcawl authored Oct 31, 2024
2 parents 9c7a112 + 931579b commit 2ba0d13
Show file tree
Hide file tree
Showing 115 changed files with 972 additions and 700 deletions.
95 changes: 17 additions & 78 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ steps:
provider: gcp
machineType: n2-highcpu-8
preemptible: true
key: quick_checks
timeout_in_minutes: 60
retry:
automatic:
Expand All @@ -54,7 +53,6 @@ steps:
provider: gcp
machineType: n2-standard-16
preemptible: true
key: linting
timeout_in_minutes: 60
retry:
automatic:
Expand All @@ -69,8 +67,23 @@ steps:
provider: gcp
machineType: n2-standard-32
preemptible: true
key: linting_with_types
timeout_in_minutes: 90
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/check_types.sh
label: 'Check Types'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: c4-standard-4
diskType: 'hyperdisk-balanced'
preemptible: true
spotZones: us-central1-a,us-central1-b,us-central1-c
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -136,11 +149,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -156,11 +164,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 4
retry:
Expand All @@ -176,11 +179,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -196,11 +194,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 5
retry:
Expand All @@ -216,11 +209,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -236,11 +224,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -256,11 +239,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -276,11 +254,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 2
retry:
Expand All @@ -296,11 +269,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 6
retry:
Expand All @@ -316,11 +284,6 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 8
retry:
Expand All @@ -338,11 +301,6 @@ steps:
localSsds: 1
localSsdInterface: nvme
machineType: n2-standard-4
depends_on:
- build
- quick_checks
- linting
- linting_with_types
timeout_in_minutes: 60
parallelism: 20
retry:
Expand All @@ -353,11 +311,6 @@ steps:
- command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
label: Trigger unsupported ftr tests
timeout_in_minutes: 10
depends_on:
- build
- quick_checks
- linting
- linting_with_types
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
Expand All @@ -378,20 +331,6 @@ steps:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/check_types.sh
label: 'Check Types'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 70
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
label: 'Check OAS Snapshot'
agents:
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/apm_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 120
parallelism: 1 # TODO: Set parallelism when apm_cypress handles it
retry:
Expand Down
28 changes: 15 additions & 13 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,21 @@ steps:
machineType: n2-standard-32
preemptible: true
key: linting_with_types
timeout_in_minutes: 90
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/check_types.sh
label: 'Check Types'
agents:
machineType: c4-standard-4
diskType: 'hyperdisk-balanced'
preemptible: true
spotZones: us-central1-a,us-central1-b,us-central1-c
key: check_types
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -85,18 +99,6 @@ steps:
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/check_types.sh
label: 'Check Types'
agents:
machineType: n2-standard-4
preemptible: true
key: check_types
timeout_in_minutes: 70
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/checks.sh
label: 'Checks'
key: checks
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/deploy_cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 30
soft_fail: true
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 60
artifact_paths:
- 'x-pack/plugins/observability_solution/exploratory_view/e2e/.journeys/**/*'
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/fips.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 60
soft_fail: true
retry:
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/fleet_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 50
parallelism: 6
retry:
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/kbn_handlebars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 5
retry:
automatic:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 120
retry:
automatic:
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/profiling_cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 120
parallelism: 2
retry:
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/response_ops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 120
parallelism: 9
retry:
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/response_ops_cases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 120
retry:
automatic:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_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,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -26,6 +27,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 60
soft_fail: true
parallelism: 1
Expand All @@ -27,6 +28,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 60
parallelism: 1
retry:
Expand All @@ -43,6 +45,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 50
soft_fail: true
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ steps:
- quick_checks
- linting
- linting_with_types
- check_types
timeout_in_minutes: 60
parallelism: 20
retry:
Expand Down
Loading

0 comments on commit 2ba0d13

Please sign in to comment.