mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
# Backport This will backport the following commits from `main` to `7.17`: - [[BK] Migrate Batch 4 (ES verification) (#180346)](https://github.com/elastic/kibana/pull/180346) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Alex Szabo","email":"alex.szabo@elastic.co"},"sourceCommit":{"committedDate":"2024-04-10T09:00:32Z","message":"[BK] Migrate Batch 4 (ES verification) (#180346)\n\n## Summary\r\nCreates new Buildkite RRE definitions for batch 4 (ES snapshot\r\nverification + ES serverless image verification).\r\nUpdates agent targeting rules in affected pipeline implementations.\r\n\r\n- [x] RREs validated with `docker.elastic.co/ci-agent-images/pipelib`'s\r\nscripts locally\r\n- [x] Tested pipelines through the pipeline staging job\r\n- [x] Serverless suite:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/22\r\n- [x] ES Snapshot build:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/26\r\n- [x] ES Snapshot verify:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/27\r\n(basically started running, but failed due to test failures - doesn't\r\nseem to be related to the infra change)\r\n- [x] ES Snapshot promote:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/28\r\n\r\nPart of: https://github.com/elastic/kibana-operations/issues/79\r\nMigration of: \r\n- kibana / elasticsearch serverless verify and promote\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-serverless-verify-and-promote)\r\n- kibana / elasticsearch snapshot build\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-build)\r\n- kibana / elasticsearch snapshot promote\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-promote)\r\n- kibana / elasticsearch snapshot verify\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-verify)\r\n\r\n---------\r\n\r\nCo-authored-by: Jon <jon@budzenski.me>","sha":"731174bcf870d822d1e14583b6b018394bd19ef7","branchLabelMapping":{"^v8.14.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","backport:skip","v8.14.0"],"number":180346,"url":"https://github.com/elastic/kibana/pull/180346","mergeCommit":{"message":"[BK] Migrate Batch 4 (ES verification) (#180346)\n\n## Summary\r\nCreates new Buildkite RRE definitions for batch 4 (ES snapshot\r\nverification + ES serverless image verification).\r\nUpdates agent targeting rules in affected pipeline implementations.\r\n\r\n- [x] RREs validated with `docker.elastic.co/ci-agent-images/pipelib`'s\r\nscripts locally\r\n- [x] Tested pipelines through the pipeline staging job\r\n- [x] Serverless suite:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/22\r\n- [x] ES Snapshot build:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/26\r\n- [x] ES Snapshot verify:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/27\r\n(basically started running, but failed due to test failures - doesn't\r\nseem to be related to the infra change)\r\n- [x] ES Snapshot promote:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/28\r\n\r\nPart of: https://github.com/elastic/kibana-operations/issues/79\r\nMigration of: \r\n- kibana / elasticsearch serverless verify and promote\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-serverless-verify-and-promote)\r\n- kibana / elasticsearch snapshot build\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-build)\r\n- kibana / elasticsearch snapshot promote\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-promote)\r\n- kibana / elasticsearch snapshot verify\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-verify)\r\n\r\n---------\r\n\r\nCo-authored-by: Jon <jon@budzenski.me>","sha":"731174bcf870d822d1e14583b6b018394bd19ef7"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.14.0","labelRegex":"^v8.14.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/180346","number":180346,"mergeCommit":{"message":"[BK] Migrate Batch 4 (ES verification) (#180346)\n\n## Summary\r\nCreates new Buildkite RRE definitions for batch 4 (ES snapshot\r\nverification + ES serverless image verification).\r\nUpdates agent targeting rules in affected pipeline implementations.\r\n\r\n- [x] RREs validated with `docker.elastic.co/ci-agent-images/pipelib`'s\r\nscripts locally\r\n- [x] Tested pipelines through the pipeline staging job\r\n- [x] Serverless suite:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/22\r\n- [x] ES Snapshot build:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/26\r\n- [x] ES Snapshot verify:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/27\r\n(basically started running, but failed due to test failures - doesn't\r\nseem to be related to the infra change)\r\n- [x] ES Snapshot promote:\r\nhttps://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/28\r\n\r\nPart of: https://github.com/elastic/kibana-operations/issues/79\r\nMigration of: \r\n- kibana / elasticsearch serverless verify and promote\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-serverless-verify-and-promote)\r\n- kibana / elasticsearch snapshot build\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-build)\r\n- kibana / elasticsearch snapshot promote\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-promote)\r\n- kibana / elasticsearch snapshot verify\r\n[kibana-es-snapshots.yml](https://buildkite.com/elastic/kibana-elasticsearch-snapshot-verify)\r\n\r\n---------\r\n\r\nCo-authored-by: Jon <jon@budzenski.me>","sha":"731174bcf870d822d1e14583b6b018394bd19ef7"}}]}] BACKPORT-->
This commit is contained in:
Alex Szabo
GitHub
parent
60c544552a
commit
c97059012a
4 changed files with 49 additions and 10 deletions
|
|
@ -3,4 +3,9 @@ steps:
|
|||
label: Build ES Snapshot
|
||||
timeout_in_minutes: 30
|
||||
agents:
|
||||
queue: c2-8
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
localSsds: 1
|
||||
localSsdInterface: nvme
|
||||
machineType: c2-standard-8
|
||||
|
|
|
|||
|
|
@ -11,4 +11,7 @@ steps:
|
|||
- label: Promote Snapshot
|
||||
command: .buildkite/scripts/steps/es_snapshots/promote.sh
|
||||
agents:
|
||||
queue: kibana-default
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: n2-standard-2
|
||||
|
|
|
|||
|
|
@ -15,14 +15,21 @@ steps:
|
|||
label: Pre-Build
|
||||
timeout_in_minutes: 10
|
||||
agents:
|
||||
queue: kibana-default
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: n2-standard-2
|
||||
|
||||
- wait
|
||||
|
||||
- command: .buildkite/scripts/steps/build_kibana.sh
|
||||
label: Build Kibana Distribution and Plugins
|
||||
agents:
|
||||
queue: c2-16
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: c2-standard-16
|
||||
preemptible: true
|
||||
key: build
|
||||
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
|
||||
timeout_in_minutes: 60
|
||||
|
|
@ -43,7 +50,10 @@ steps:
|
|||
- command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
|
||||
label: 'Docker CI Group'
|
||||
agents:
|
||||
queue: n2-4
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: n2-standard-4
|
||||
depends_on: build
|
||||
timeout_in_minutes: 120
|
||||
key: default-cigroup-docker
|
||||
|
|
@ -56,7 +66,11 @@ steps:
|
|||
label: 'OSS CI Group'
|
||||
parallelism: 11
|
||||
agents:
|
||||
queue: ci-group-4d
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: n2-standard-4
|
||||
preemptible: true
|
||||
depends_on: build
|
||||
timeout_in_minutes: 120
|
||||
key: oss-cigroup
|
||||
|
|
@ -69,7 +83,10 @@ steps:
|
|||
label: 'Jest Integration Tests'
|
||||
parallelism: 3
|
||||
agents:
|
||||
queue: n2-4
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: n2-standard-4
|
||||
timeout_in_minutes: 120
|
||||
key: jest-integration
|
||||
retry:
|
||||
|
|
@ -80,7 +97,10 @@ steps:
|
|||
- command: .buildkite/scripts/steps/test/api_integration.sh
|
||||
label: 'API Integration Tests'
|
||||
agents:
|
||||
queue: n2-2
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: n2-standard-2
|
||||
timeout_in_minutes: 120
|
||||
key: api-integration
|
||||
|
||||
|
|
@ -88,7 +108,10 @@ steps:
|
|||
label: Trigger promotion
|
||||
timeout_in_minutes: 10
|
||||
agents:
|
||||
queue: kibana-default
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: n2-standard-2
|
||||
depends_on:
|
||||
- default-cigroup
|
||||
- default-cigroup-docker
|
||||
|
|
@ -103,4 +126,7 @@ steps:
|
|||
label: Post-Build
|
||||
timeout_in_minutes: 10
|
||||
agents:
|
||||
queue: kibana-default
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-qa
|
||||
provider: gcp
|
||||
machineType: n2-standard-2
|
||||
|
|
|
|||
5
.buildkite/pipelines/upload_pipeline.yml
Normal file
5
.buildkite/pipelines/upload_pipeline.yml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
# This pipeline can be used to upload any tested pipeline in the Elastic-wide buildkite infrastructure to be tested
|
||||
|
||||
steps:
|
||||
- label: Upload tested pipeline
|
||||
command: buildkite-agent pipeline upload ${TESTED_PIPELINE_PATH:-.buildkite/pipelines/pipeline_to_test.yml}
|
||||
Loading…
Add table
Add a link
Reference in a new issue