Skip to content

Commit b561361

Browse files
authored
[8.19] (backport #10906) fix(bk): serverless-beats-tests start failing after merging #10734 (#10919)
1 parent 948ba76 commit b561361

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

.buildkite/hooks/pre-command

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent-package" ]]; then
3434
fi
3535
fi
3636

37-
if [[ "$BUILDKITE_PIPELINE_SLUG" == "buildkite-elastic-agent-integration-matrix" ]]; then
38-
echo "Setting credentials"
39-
# Set GCP credentials
37+
if [[ ("$BUILDKITE_PIPELINE_SLUG" == "buildkite-elastic-agent-integration-matrix") || ("$BUILDKITE_PIPELINE_SLUG" == "beats-agent-serverless-tests") ]]; then
38+
echo "Setting GCP credentials"
4039
export GOOGLE_APPLICATION_GCP_SECRET=$(retry 5 vault kv get -format=json -field=data ${CI_GCP_OBS_PATH})
4140
echo "${GOOGLE_APPLICATION_GCP_SECRET}" > ./gcp.json
4241
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ./gcp.json)

.buildkite/pipeline.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,3 +343,21 @@ steps:
343343
build:
344344
commit: "${BUILDKITE_COMMIT}"
345345
branch: "${BUILDKITE_BRANCH}"
346+
# Trigger for pull requests - Serverless Beats Tests
347+
# this should help detecting issues earlier in the development cycle
348+
- label: "Trigger Serverless Beats Tests"
349+
if: build.pull_request.id != null
350+
plugins:
351+
- monorepo-diff#v1.2.0:
352+
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
353+
interpolation: false
354+
watch:
355+
- path:
356+
- .buildkite/serverless.beats.tests.yml
357+
- .buildkite/scripts/steps/beats_tests.sh
358+
- .buildkite/hooks/pre-command
359+
config:
360+
trigger: "beats-agent-serverless-tests"
361+
build:
362+
commit: "${BUILDKITE_COMMIT}"
363+
branch: "${BUILDKITE_BRANCH}"

0 commit comments

Comments
 (0)