From 56f717d5f93e75fc926395d6a41e46c966bf127d Mon Sep 17 00:00:00 2001 From: Alex Szabo Date: Mon, 13 May 2024 16:06:55 +0200 Subject: [PATCH] [BK] Migrate batch 1 (Artifact builds) (#182582) ## Summary Migrates batch 1 - artifact builds. The upload aspect wasn't tested, because it's programmed only to run from `main`, and we didn't want to interfere with the ongoing releases. This can be tested after the merge. Verification: - [x] RREs tested locally - [x] kibana / artifacts trigger (https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/87) - [x] kibana / artifacts container image (https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/86) - [x] kibana / artifacts snapshot (https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88) - [x] kibana / artifacts staging (https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88) - [x] 8.13 / 8.14 / 7.17 verification (only a few jobs need to work here) Originals: - kibana / artifacts trigger [kibana-artifacts-trigger.yml](https://buildkite.com/elastic/kibana-artifacts-trigger) - kibana / artifacts container image [kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-container-image) - kibana / artifacts snapshot [kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-snapshot) - kibana / artifacts staging [kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-staging) Backports: - https://github.com/elastic/kibana/pull/182781 - https://github.com/elastic/kibana/pull/182780 The backports don't need to have the pipeline resource definition files, however, we forked 8.14 off from main, where we already had the resources. I'll remove all the unnecessary resource defs from the legacy branches, once we finalize the state (simply to save a little inconvenience on future backports.) (cherry picked from commit d5362fdaf7da5dd60f26da2ce4c64313c5930317) # Conflicts: # .buildkite/pipeline-resource-definitions/locations.yml # .buildkite/pipelines/artifacts.yml # .buildkite/pipelines/artifacts_container_image.yml # .buildkite/pipelines/artifacts_trigger.yml --- .buildkite/pipelines/artifacts.yml | 57 +++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml index ce96c61313459b..73b44ce053726a 100644 --- a/.buildkite/pipelines/artifacts.yml +++ b/.buildkite/pipelines/artifacts.yml @@ -2,7 +2,10 @@ steps: - command: .buildkite/scripts/steps/artifacts/build.sh label: Build Kibana Artifacts agents: - queue: c2-16 + image: family/kibana-ubuntu-2004 + imageProject: elastic-images-qa + provider: gcp + machineType: c2-standard-16 timeout_in_minutes: 60 retry: automatic: @@ -14,7 +17,13 @@ steps: - command: TEST_PACKAGE=deb .buildkite/scripts/steps/package_testing/test.sh label: Artifact Testing agents: - queue: n2-4-virt + image: family/kibana-ubuntu-2004 + imageProject: elastic-images-qa + provider: gcp + enableNestedVirtualization: true + localSsds: 1 + localSsdInterface: nvme + machineType: n2-standard-4 timeout_in_minutes: 30 retry: automatic: @@ -24,7 +33,13 @@ steps: - command: TEST_PACKAGE=rpm .buildkite/scripts/steps/package_testing/test.sh label: Artifact Testing agents: - queue: n2-4-virt + image: family/kibana-ubuntu-2004 + imageProject: elastic-images-qa + provider: gcp + enableNestedVirtualization: true + localSsds: 1 + localSsdInterface: nvme + machineType: n2-standard-4 timeout_in_minutes: 30 retry: automatic: @@ -34,7 +49,13 @@ steps: - command: TEST_PACKAGE=docker .buildkite/scripts/steps/package_testing/test.sh label: Artifact Testing agents: - queue: n2-4-virt + image: family/kibana-ubuntu-2004 + imageProject: elastic-images-qa + provider: gcp + enableNestedVirtualization: true + localSsds: 1 + localSsdInterface: nvme + machineType: n2-standard-4 timeout_in_minutes: 30 retry: automatic: @@ -44,7 +65,12 @@ steps: - command: KIBANA_DOCKER_CONTEXT=default .buildkite/scripts/steps/artifacts/docker_context.sh label: 'Docker Context Verification' agents: - queue: n2-2 + image: family/kibana-ubuntu-2004 + imageProject: elastic-images-qa + provider: gcp + localSsds: 1 + localSsdInterface: nvme + machineType: n2-standard-2 timeout_in_minutes: 30 retry: automatic: @@ -54,7 +80,12 @@ steps: - command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh label: 'Docker Context Verification' agents: - queue: n2-2 + image: family/kibana-ubuntu-2004 + imageProject: elastic-images-qa + provider: gcp + localSsds: 1 + localSsdInterface: nvme + machineType: n2-standard-2 timeout_in_minutes: 30 retry: automatic: @@ -64,7 +95,12 @@ steps: - command: KIBANA_DOCKER_CONTEXT=ironbank .buildkite/scripts/steps/artifacts/docker_context.sh label: 'Docker Context Verification' agents: - queue: n2-2 + image: family/kibana-ubuntu-2004 + imageProject: elastic-images-qa + provider: gcp + localSsds: 1 + localSsdInterface: nvme + machineType: n2-standard-2 timeout_in_minutes: 30 retry: automatic: @@ -76,5 +112,10 @@ steps: - command: .buildkite/scripts/steps/artifacts/publish.sh label: 'Publish Kibana Artifacts' agents: - queue: n2-2 + image: family/kibana-ubuntu-2004 + imageProject: elastic-images-qa + provider: gcp + localSsds: 1 + localSsdInterface: nvme + machineType: n2-standard-2 timeout_in_minutes: 30