From b3f9a4da1a10998d21254f44236167554b654ec5 Mon Sep 17 00:00:00 2001 From: Alex Szabo Date: Thu, 6 Mar 2025 23:35:32 +0100 Subject: [PATCH 1/4] trigger VM image rebuild with cache rebuild only --- .../scripts/steps/es_serverless/promote_es_serverless_image.sh | 3 ++- .buildkite/scripts/steps/es_snapshots/promote.sh | 3 ++- .buildkite/scripts/steps/fleet/promote_package_registry.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh b/.buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh index a8885c44cfb74..309086fedb007 100755 --- a/.buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh +++ b/.buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh @@ -77,6 +77,7 @@ steps: async: true build: env: - IMAGES_CONFIG: "kibana/images.yml" + IMAGES_CONFIG: 'kibana/image_cache.yml' + BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml' RETRY: "1" EOF diff --git a/.buildkite/scripts/steps/es_snapshots/promote.sh b/.buildkite/scripts/steps/es_snapshots/promote.sh index 2b85505619a95..9f249680dd851 100755 --- a/.buildkite/scripts/steps/es_snapshots/promote.sh +++ b/.buildkite/scripts/steps/es_snapshots/promote.sh @@ -25,6 +25,7 @@ steps: async: true build: env: - IMAGES_CONFIG: "kibana/images.yml" + IMAGES_CONFIG: 'kibana/image_cache.yml' + BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml' RETRY: "1" EOF diff --git a/.buildkite/scripts/steps/fleet/promote_package_registry.sh b/.buildkite/scripts/steps/fleet/promote_package_registry.sh index 5fa62369cfa87..ba40b3214db96 100755 --- a/.buildkite/scripts/steps/fleet/promote_package_registry.sh +++ b/.buildkite/scripts/steps/fleet/promote_package_registry.sh @@ -14,7 +14,8 @@ steps: async: true build: env: - IMAGES_CONFIG: "kibana/images.yml" + IMAGES_CONFIG: 'kibana/image_cache.yml' + BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml' RETRY: "1" EOF else From 5b9c8db80921ec33697774ea31b82003ca06b5aa Mon Sep 17 00:00:00 2001 From: Alex Szabo Date: Thu, 6 Mar 2025 23:40:44 +0100 Subject: [PATCH 2/4] run a daily cache layer build (in case promotions won't happen) --- .../kibana-vm-images.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml b/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml index c0ca615646e93..6b3a795f75aa8 100644 --- a/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml +++ b/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml @@ -27,15 +27,22 @@ spec: provider_settings: trigger_mode: none schedules: - daily kibana image build: + daily kibana base image build: branch: main cronline: '0 0 * * *' env: - IMAGES_CONFIG: kibana/images.yml + IMAGES_CONFIG: kibana/base_image.yml + message: Builds Kibana VM images daily + daily kibana cache layer build: + branch: main + cronline: '0 1 * * *' # make sure this runs after the daily kibana base image build + env: + IMAGES_CONFIG: kibana/base_image.yml + BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml' message: Builds Kibana VM images daily daily kibana fips image build: branch: main - cronline: '0 4 * * *' # make sure this runs after the daily kibana image build + cronline: '0 4 * * *' # make sure this runs after the daily kibana cache image build env: BASE_IMAGES_CONFIG: 'core/images.yml,kibana/images.yml' IMAGES_CONFIG: kibana/fips.yml From 74439ec6c04b14723b1ab0b34a263fe49dc99c52 Mon Sep 17 00:00:00 2001 From: Alex Szabo Date: Fri, 7 Mar 2025 00:15:38 +0100 Subject: [PATCH 3/4] update messages --- .buildkite/pipeline-resource-definitions/kibana-vm-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml b/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml index 6b3a795f75aa8..d5aab1d9edbaa 100644 --- a/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml +++ b/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml @@ -32,14 +32,14 @@ spec: cronline: '0 0 * * *' env: IMAGES_CONFIG: kibana/base_image.yml - message: Builds Kibana VM images daily + message: Builds Kibana VM base image daily daily kibana cache layer build: branch: main cronline: '0 1 * * *' # make sure this runs after the daily kibana base image build env: IMAGES_CONFIG: kibana/base_image.yml BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml' - message: Builds Kibana VM images daily + message: Builds Kibana VM cache warmup daily daily kibana fips image build: branch: main cronline: '0 4 * * *' # make sure this runs after the daily kibana cache image build From dd987f2d48f0a4f40d03d8e4ab7696d1b05afdfa Mon Sep 17 00:00:00 2001 From: Alex Szabo Date: Fri, 7 Mar 2025 11:25:51 +0100 Subject: [PATCH 4/4] fix incorrect images config, split BASE_IMAGES_CONFIG for fips --- .buildkite/pipeline-resource-definitions/kibana-vm-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml b/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml index d5aab1d9edbaa..d17ff5ffc3b70 100644 --- a/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml +++ b/.buildkite/pipeline-resource-definitions/kibana-vm-images.yml @@ -37,14 +37,14 @@ spec: branch: main cronline: '0 1 * * *' # make sure this runs after the daily kibana base image build env: - IMAGES_CONFIG: kibana/base_image.yml + IMAGES_CONFIG: kibana/image_cache.yml BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml' message: Builds Kibana VM cache warmup daily daily kibana fips image build: branch: main cronline: '0 4 * * *' # make sure this runs after the daily kibana cache image build env: - BASE_IMAGES_CONFIG: 'core/images.yml,kibana/images.yml' + BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml,kibana/image_cache.yml' IMAGES_CONFIG: kibana/fips.yml message: Builds Kibana FIPS VM image daily teams: