Skip to content

Commit bb00e15

Browse files
pazonemergify[bot]
authored andcommitted
[CI] Trigger improvements (#4836)
* [CI] Added .github and .ci directories to skip_ci_on_only_changed * [CI] Removed sonar-project.properties from ignored PR changesets * [CI] skip labels and CI cheatsheet * Added alternative triggers description (cherry picked from commit 0b99ccb) # Conflicts: # .buildkite/pull-requests.json
1 parent d0bce03 commit bb00e15

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
lines changed

.buildkite/pull-requests.json

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"jobs": [
33
{
4-
"enabled": true,
4+
"enabled": true,
55
"pipelineSlug": "elastic-agent",
66
"allow_org_users": true,
77
"allowed_repo_permissions": ["admin", "write"],
@@ -11,9 +11,30 @@
1111
"build_on_comment": true,
1212
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
1313
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
14-
"skip_ci_labels": [ ],
14+
"skip_ci_labels": [ "skip-ci" ],
1515
"skip_target_branches": [ ],
16+
<<<<<<< HEAD
1617
"skip_ci_on_only_changed": [ ],
18+
=======
19+
"skip_ci_on_only_changed": [ "^.ci/", "^.github/", "^changelog", "^docs/", "\\.md$", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
20+
"always_require_ci_on_changed": [ ]
21+
},
22+
{
23+
"enabled": true,
24+
"build_drafts": false,
25+
"pipelineSlug": "elastic-agent-extended-testing",
26+
"allow_org_users": true,
27+
"allowed_repo_permissions": ["admin", "write"],
28+
"allowed_list": ["dependabot[bot]", "mergify[bot]"],
29+
"set_commit_status": true,
30+
"build_on_commit": true,
31+
"build_on_comment": true,
32+
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$",
33+
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$",
34+
"skip_ci_labels": [ "skip-ci", "skip-it" ],
35+
"skip_target_branches": [ ],
36+
"skip_ci_on_only_changed": [ "^.ci/", "^.github/", "^changelog", "^docs/", "\\.md$", "^sonar-project.properties", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
37+
>>>>>>> 0b99ccb922 ([CI] Trigger improvements (#4836))
1738
"always_require_ci_on_changed": [ ]
1839
},
1940
{

.github/PULL_REQUEST_TEMPLATE.md

+10
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,13 @@ Paste here output logs discovered while creating this PR, such as stack traces o
8888
- How are we going to debug this?
8989
- What are the metrics I should take care of?
9090
- ...
91+
92+
<!-- CI Cheatsheet
93+
Trigger comments:
94+
/test (Or `buildkite test this|it`) Triggers unit test pipeline
95+
/test extended (Or `buildkite test extended`) Triggers integration test pipeline
96+
97+
PR labels:
98+
skip-ci Skips unit and integration tests
99+
skip-it Skips integration tests
100+
-->

0 commit comments

Comments
 (0)