Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

set -euo pipefail

# If cached snapshots are baked into the agent, copy them into our workspace first
# If cached snapshots are baked into the agent, move them into our workspace first
# We are doing this rather than simply changing the ES base path because many workers
# run with the workspace mounted in memory or on a local ssd
cacheDir="$ES_CACHE_DIR/cache"
if [[ -d "$cacheDir" ]]; then
mkdir -p .es/cache
echo "--- Copying ES snapshot cache"
echo "Copying cached snapshots from $cacheDir to .es/cache"
cp -R "$cacheDir"/* .es/cache/
echo "--- Move ES snapshot cache"
echo "Moving cached snapshots from $cacheDir to .es/cache"
mv "$cacheDir"/* .es/cache/
fi
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail

export DISABLE_BOOTSTRAP_VALIDATION=false
.buildkite/scripts/bootstrap.sh
.buildkite/scripts/copy_es_snapshot_cache.sh
.buildkite/scripts/setup_es_snapshot_cache.sh

if [[ "${FTR_ENABLE_FIPS_AGENT:-}" == "true" ]]; then
.buildkite/scripts/steps/checks/verify_fips_enabled.sh
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail
source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/copy_es_snapshot_cache.sh
.buildkite/scripts/setup_es_snapshot_cache.sh

echo --- Capture OAS snapshot
cmd="node scripts/capture_oas_snapshot \
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh
.buildkite/scripts/setup_es_snapshot_cache.sh

is_test_execution_step

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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
.buildkite/scripts/setup_es_snapshot_cache.sh

export JOB=kibana-observability-plugin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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
.buildkite/scripts/setup_es_snapshot_cache.sh

export JOB=kibana-observability-onboarding-cypress

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/synthetics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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
.buildkite/scripts/setup_es_snapshot_cache.sh

export JOB=kibana-uptime-playwright

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/synthetics_plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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
.buildkite/scripts/setup_es_snapshot_cache.sh

export JOB=kibana-synthetics-plugin

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/uptime_plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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
.buildkite/scripts/setup_es_snapshot_cache.sh

export JOB=kibana-uptime-plugin

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/ux_synthetics_e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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
.buildkite/scripts/setup_es_snapshot_cache.sh

export JOB=kibana-ux-plugin-synthetics

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/test/jest_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source .buildkite/scripts/common/util.sh
is_test_execution_step

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/copy_es_snapshot_cache.sh
.buildkite/scripts/setup_es_snapshot_cache.sh

echo '--- Jest Integration Tests'
.buildkite/scripts/steps/test/jest_parallel.sh jest.integration.config.js
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/test/scout_test_run_builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail
source .buildkite/scripts/common/util.sh
.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh
.buildkite/scripts/setup_es_snapshot_cache.sh

echo '--- Verify Playwright CLI is functional'
node scripts/scout run-playwright-test-check
Expand Down