From 8b02c0d2ef605e5829bb8fecbf9b17a1f0f135aa Mon Sep 17 00:00:00 2001
From: Jon <jon@elastic.co>
Date: Fri, 25 Oct 2024 12:25:02 -0500
Subject: [PATCH] [ci] Use es snapshot cache on miscellaneous steps, adjust
 schedule (#197294)

The schedule adjustment is due to 7.17 verification taking longer than
other branches. Currently, we only rebuild once when main is updated.
This is a stopgap until a cache-only update can be introduced to avoid
continuous image rebuilds.
---
 .../pipeline-resource-definitions/kibana-es-snapshots.yml    | 2 +-
 .buildkite/scripts/steps/checks/capture_oas_snapshot.sh      | 5 +++--
 .buildkite/scripts/steps/functional/apm_cypress.sh           | 1 +
 .buildkite/scripts/steps/functional/inventory_cypress.sh     | 1 +
 .../steps/functional/observability_onboarding_cypress.sh     | 1 +
 .buildkite/scripts/steps/functional/profiling_cypress.sh     | 1 +
 .buildkite/scripts/steps/functional/synthetics.sh            | 1 +
 7 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml b/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
index 5a2521bb23026..b99fd82408b76 100644
--- a/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
+++ b/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
@@ -62,7 +62,7 @@ spec:
           message: Daily build
           branch: '8.15'
         Daily build (7.17):
-          cronline: 0 22 * * * America/New_York
+          cronline: 0 20 * * * America/New_York
           message: Daily build
           branch: '7.17'
       tags:
diff --git a/.buildkite/scripts/steps/checks/capture_oas_snapshot.sh b/.buildkite/scripts/steps/checks/capture_oas_snapshot.sh
index 0c0f7ac996bba..e9f42d67008ea 100755
--- a/.buildkite/scripts/steps/checks/capture_oas_snapshot.sh
+++ b/.buildkite/scripts/steps/checks/capture_oas_snapshot.sh
@@ -2,10 +2,11 @@
 
 set -euo pipefail
 
-.buildkite/scripts/bootstrap.sh
-
 source .buildkite/scripts/common/util.sh
 
+.buildkite/scripts/bootstrap.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
+
 echo --- Capture OAS snapshot
 cmd="node scripts/capture_oas_snapshot --include-path /api/status --include-path /api/alerting/rule/ --include-path /api/alerting/rules --include-path /api/actions --include-path /api/security/role --include-path /api/spaces --include-path /api/fleet"
 if is_pr && ! is_auto_commit_disabled; then
diff --git a/.buildkite/scripts/steps/functional/apm_cypress.sh b/.buildkite/scripts/steps/functional/apm_cypress.sh
index 976c551dfe19a..1fc10089e8eb4 100755
--- a/.buildkite/scripts/steps/functional/apm_cypress.sh
+++ b/.buildkite/scripts/steps/functional/apm_cypress.sh
@@ -8,6 +8,7 @@ APM_CYPRESS_RECORD_KEY="$(vault_get apm-cypress-dashboard-record-key CYPRESS_REC
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-apm-cypress
 IS_FLAKY_TEST_RUNNER=${CLI_COUNT:-0}
diff --git a/.buildkite/scripts/steps/functional/inventory_cypress.sh b/.buildkite/scripts/steps/functional/inventory_cypress.sh
index b238b62c9c1fe..b45215ca86505 100644
--- a/.buildkite/scripts/steps/functional/inventory_cypress.sh
+++ b/.buildkite/scripts/steps/functional/inventory_cypress.sh
@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-inventory-onboarding-cypress
 
diff --git a/.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh b/.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh
index 095ef5c723392..802bb447f72d2 100644
--- a/.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh
+++ b/.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh
@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-observability-onboarding-cypress
 
diff --git a/.buildkite/scripts/steps/functional/profiling_cypress.sh b/.buildkite/scripts/steps/functional/profiling_cypress.sh
index daad169069ae3..4e5fb770a12b4 100644
--- a/.buildkite/scripts/steps/functional/profiling_cypress.sh
+++ b/.buildkite/scripts/steps/functional/profiling_cypress.sh
@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-profiling-cypress
 
diff --git a/.buildkite/scripts/steps/functional/synthetics.sh b/.buildkite/scripts/steps/functional/synthetics.sh
index 3d22131701762..aa388096fc404 100644
--- a/.buildkite/scripts/steps/functional/synthetics.sh
+++ b/.buildkite/scripts/steps/functional/synthetics.sh
@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 export JOB=kibana-uptime-playwright