Skip to content

Commit 272b5c7

Browse files
authored
Use monorepo plugin on PR and triggers for branches (#39176)
Fix the Beats main pipeline to work when running on merge commits on branches as well as pull requests.
1 parent b727b3e commit 272b5c7

File tree

1 file changed

+136
-0
lines changed

1 file changed

+136
-0
lines changed

.buildkite/pipeline.yml

+136
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
steps:
44
- label: "Trigger Auditbeat"
5+
if: build.pull_request.id != null
56
plugins:
67
- monorepo-diff#v1.0.1:
78
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -27,7 +28,15 @@ steps:
2728
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
2829
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
2930

31+
- label: "Triggering Build for Auditbeat"
32+
if: build.pull_request.id == null
33+
trigger: "auditbeat"
34+
build:
35+
commit: "${BUILDKITE_COMMIT}"
36+
branch: "${BUILDKITE_BRANCH}"
37+
3038
- label: "Trigger Heartbeat"
39+
if: build.pull_request.id != null
3140
plugins:
3241
- monorepo-diff#v1.0.1:
3342
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -53,7 +62,15 @@ steps:
5362
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
5463
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
5564

65+
- label: "Triggering Build for Heartbeat"
66+
if: build.pull_request.id == null
67+
trigger: "heartbeat"
68+
build:
69+
commit: "${BUILDKITE_COMMIT}"
70+
branch: "${BUILDKITE_BRANCH}"
71+
5672
- label: "Trigger Filebeat"
73+
if: build.pull_request.id != null
5774
plugins:
5875
- monorepo-diff#v1.0.1:
5976
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -80,7 +97,15 @@ steps:
8097
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
8198
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
8299

100+
- label: "Triggering Build for Filebeat"
101+
if: build.pull_request.id == null
102+
trigger: "filebeat"
103+
build:
104+
commit: "${BUILDKITE_COMMIT}"
105+
branch: "${BUILDKITE_BRANCH}"
106+
83107
- label: "Trigger x-pack/filebeat"
108+
if: build.pull_request.id != null
84109
plugins:
85110
- monorepo-diff#v1.0.1:
86111
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -107,7 +132,15 @@ steps:
107132
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
108133
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
109134

135+
- label: "Triggering Build for x-pack/filebeat"
136+
if: build.pull_request.id == null
137+
trigger: "beats-xpack-filebeat"
138+
build:
139+
commit: "${BUILDKITE_COMMIT}"
140+
branch: "${BUILDKITE_BRANCH}"
141+
110142
- label: "Trigger Xpack/Dockerlogbeat"
143+
if: build.pull_request.id != null
111144
plugins:
112145
- monorepo-diff#v1.0.1:
113146
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -133,7 +166,15 @@ steps:
133166
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
134167
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
135168

169+
- label: "Triggering Build for x-pack/dockerlogbeat"
170+
if: build.pull_request.id == null
171+
trigger: "beats-xpack-dockerlogbeat"
172+
build:
173+
commit: "${BUILDKITE_COMMIT}"
174+
branch: "${BUILDKITE_BRANCH}"
175+
136176
- label: "Trigger Metricbeat"
177+
if: build.pull_request.id != null
137178
plugins:
138179
- monorepo-diff#v1.0.1:
139180
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -159,7 +200,15 @@ steps:
159200
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
160201
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
161202

203+
- label: "Triggering Build for Metricbeat"
204+
if: build.pull_request.id == null
205+
trigger: "beats-metricbeat"
206+
build:
207+
commit: "${BUILDKITE_COMMIT}"
208+
branch: "${BUILDKITE_BRANCH}"
209+
162210
- label: "Trigger x-pack/metricbeat"
211+
if: build.pull_request.id != null
163212
plugins:
164213
- monorepo-diff#v1.0.1:
165214
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -186,7 +235,15 @@ steps:
186235
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
187236
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
188237

238+
- label: "Triggering Build for x-pack/metricbeat"
239+
if: build.pull_request.id == null
240+
trigger: "beats-xpack-metricbeat"
241+
build:
242+
commit: "${BUILDKITE_COMMIT}"
243+
branch: "${BUILDKITE_BRANCH}"
244+
189245
- label: "Trigger x-pack/osquerybeat"
246+
if: build.pull_request.id != null
190247
plugins:
191248
- monorepo-diff#v1.0.1:
192249
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -215,7 +272,15 @@ steps:
215272
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
216273
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
217274

275+
- label: "Triggering Build for x-pack/osquerybeat"
276+
if: build.pull_request.id == null
277+
trigger: "beats-xpack-osquerybeat"
278+
build:
279+
commit: "${BUILDKITE_COMMIT}"
280+
branch: "${BUILDKITE_BRANCH}"
281+
218282
- label: "Trigger Xpack/Winlogbeat"
283+
if: build.pull_request.id != null
219284
plugins:
220285
- monorepo-diff#v1.0.1:
221286
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -241,7 +306,15 @@ steps:
241306
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
242307
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
243308

309+
- label: "Triggering Build for Xpack/Winlogbeat"
310+
if: build.pull_request.id == null
311+
trigger: "beats-xpack-winlogbeat"
312+
build:
313+
commit: "${BUILDKITE_COMMIT}"
314+
branch: "${BUILDKITE_BRANCH}"
315+
244316
- label: "Trigger Deploy/K8S"
317+
if: build.pull_request.id != null
245318
plugins:
246319
- monorepo-diff#v1.0.1:
247320
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -262,7 +335,15 @@ steps:
262335
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
263336
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
264337

338+
- label: "Triggering Build for Deploy/K8S"
339+
if: build.pull_request.id == null
340+
trigger: "deploy-k8s"
341+
build:
342+
commit: "${BUILDKITE_COMMIT}"
343+
branch: "${BUILDKITE_BRANCH}"
344+
265345
- label: "Trigger Libbeat"
346+
if: build.pull_request.id != null
266347
plugins:
267348
- monorepo-diff#v1.0.1:
268349
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -287,7 +368,15 @@ steps:
287368
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
288369
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
289370

371+
- label: "Triggering Build for Libbeat"
372+
if: build.pull_request.id == null
373+
trigger: "beats-libbeat"
374+
build:
375+
commit: "${BUILDKITE_COMMIT}"
376+
branch: "${BUILDKITE_BRANCH}"
377+
290378
- label: "Trigger x-pack/libbeat"
379+
if: build.pull_request.id != null
291380
plugins:
292381
- monorepo-diff#v1.0.1:
293382
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -313,7 +402,15 @@ steps:
313402
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
314403
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
315404

405+
- label: "Triggering Build for x-pack/libbeat"
406+
if: build.pull_request.id == null
407+
trigger: "beats-xpack-libbeat"
408+
build:
409+
commit: "${BUILDKITE_COMMIT}"
410+
branch: "${BUILDKITE_BRANCH}"
411+
316412
- label: "Trigger x-pack/auditbeat"
413+
if: build.pull_request.id != null
317414
plugins:
318415
- monorepo-diff#v1.0.1:
319416
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -340,7 +437,15 @@ steps:
340437
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
341438
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
342439

440+
- label: "Triggering Build for x-pack/auditbeat"
441+
if: build.pull_request.id == null
442+
trigger: "beats-xpack-auditbeat"
443+
build:
444+
commit: "${BUILDKITE_COMMIT}"
445+
branch: "${BUILDKITE_BRANCH}"
446+
343447
- label: "Trigger x-pack/heartbeat"
448+
if: build.pull_request.id != null
344449
plugins:
345450
- monorepo-diff#v1.0.1:
346451
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -367,7 +472,15 @@ steps:
367472
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
368473
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
369474

475+
- label: "Triggering Build for x-pack/heartbeat"
476+
if: build.pull_request.id == null
477+
trigger: "beats-xpack-heartbeat"
478+
build:
479+
commit: "${BUILDKITE_COMMIT}"
480+
branch: "${BUILDKITE_BRANCH}"
481+
370482
- label: "Trigger x-pack/packetbeat"
483+
if: build.pull_request.id != null
371484
plugins:
372485
- monorepo-diff#v1.0.1:
373486
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -394,7 +507,15 @@ steps:
394507
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
395508
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
396509

510+
- label: "Triggering Build for x-pack/packetbeat"
511+
if: build.pull_request.id == null
512+
trigger: "beats-xpack-packetbeat"
513+
build:
514+
commit: "${BUILDKITE_COMMIT}"
515+
branch: "${BUILDKITE_BRANCH}"
516+
397517
- label: "Trigger Winlogbeat"
518+
if: build.pull_request.id != null
398519
plugins:
399520
- monorepo-diff#v1.0.1:
400521
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -420,7 +541,15 @@ steps:
420541
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
421542
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
422543

544+
- label: "Triggering Build for Winlogbeat"
545+
if: build.pull_request.id == null
546+
trigger: "beats-winlogbeat"
547+
build:
548+
commit: "${BUILDKITE_COMMIT}"
549+
branch: "${BUILDKITE_BRANCH}"
550+
423551
- label: "Trigger Packetbeat"
552+
if: build.pull_request.id != null
424553
plugins:
425554
- monorepo-diff#v1.0.1:
426555
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
@@ -445,3 +574,10 @@ steps:
445574
- BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
446575
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
447576
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
577+
578+
- label: "Triggering Build for Packetbeat"
579+
if: build.pull_request.id == null
580+
trigger: "beats-packetbeat"
581+
build:
582+
commit: "${BUILDKITE_COMMIT}"
583+
branch: "${BUILDKITE_BRANCH}"

0 commit comments

Comments
 (0)