Skip to content

Commit

Permalink
Merge branch 'main' into sync-integrations-1
Browse files Browse the repository at this point in the history
  • Loading branch information
juliaElastic authored Feb 3, 2025
2 parents e9d8335 + e0fa846 commit bc18349
Show file tree
Hide file tree
Showing 1,259 changed files with 17,617 additions and 6,797 deletions.
6 changes: 4 additions & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"repoName": "kibana",
"targetBranchChoices": [
"main",
"9.0",
"8.x",
"8.18",
"8.17",
"8.16",
"8.15",
Expand Down Expand Up @@ -55,8 +57,8 @@
"backport"
],
"branchLabelMapping": {
"^v9.0.0$": "main",
"^v8.18.0$": "8.x",
"^v9.1.0$": "main",
"^v8.19.0$": "8.x",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
Expand Down
14 changes: 11 additions & 3 deletions .buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
Expand All @@ -48,10 +48,18 @@ spec:
cronline: 0 22 * * * America/New_York
message: Daily build
branch: main
Daily build (9.0):
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '9.0'
Daily build (8.x):
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '8.x'
Daily build (8.18):
cronline: 0 22 * * * America/New_York
message: Daily build
branch: '8.18'
Daily build (8.17):
cronline: 0 22 * * * America/New_York
message: Daily build
Expand Down Expand Up @@ -95,7 +103,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
Expand Down Expand Up @@ -144,7 +152,7 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
SCOUT_REPORTER_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.x 8.17 8.16 7.17
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/on_merge.yml
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 @@ -55,7 +55,7 @@ steps:
provider: gcp
machineType: n2-standard-2
preemptible: true
diskSizeGb: 75
diskSizeGb: 80
timeout_in_minutes: 60
retry:
automatic:
Expand Down Expand Up @@ -117,7 +117,7 @@ steps:
provider: gcp
machineType: n2-standard-4
preemptible: true
diskSizeGb: 75
diskSizeGb: 80
timeout_in_minutes: 60
retry:
automatic:
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 @@ -41,7 +41,7 @@ steps:
agents:
machineType: n2-standard-2
preemptible: true
diskSizeGb: 75
diskSizeGb: 80
timeout_in_minutes: 60
retry:
automatic:
Expand Down Expand Up @@ -79,7 +79,7 @@ steps:
agents:
machineType: n2-standard-4
preemptible: true
diskSizeGb: 75
diskSizeGb: 80
key: check_oas_snapshot
timeout_in_minutes: 60
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 300
parallelism: 5
retry:
Expand Down Expand Up @@ -91,7 +90,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -107,7 +105,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -123,7 +120,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -142,7 +138,6 @@ steps:
provider: gcp
enableNestedVirtualization: true
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 300
parallelism: 3
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 8
Expand All @@ -27,7 +26,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 6
Expand All @@ -43,7 +41,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -58,7 +55,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -73,7 +69,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -88,7 +83,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -103,7 +97,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -118,7 +111,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -133,7 +125,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -148,7 +139,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -163,7 +153,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -178,7 +167,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -193,7 +181,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -208,7 +195,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -223,7 +209,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -238,7 +223,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -253,7 +237,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -268,7 +251,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -283,7 +265,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -298,7 +279,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -313,7 +293,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -328,7 +307,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -343,7 +321,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -358,7 +335,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -373,7 +349,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -388,7 +363,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -403,7 +377,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -418,7 +391,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -433,7 +405,6 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand Down
Loading

0 comments on commit bc18349

Please sign in to comment.