From bb00e159284877598506239ce4153650181a303d Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Tue, 4 Jun 2024 16:38:40 +0200
Subject: [PATCH 1/2] [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 0b99ccb922d26bcd26f6911534530b1e90149a8a)

# Conflicts:
#	.buildkite/pull-requests.json
---
 .buildkite/pull-requests.json    | 25 +++++++++++++++++++++++--
 .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json
index 6b6ef40b827..adb430bba34 100644
--- a/.buildkite/pull-requests.json
+++ b/.buildkite/pull-requests.json
@@ -1,7 +1,7 @@
 {
     "jobs": [
         {
-            "enabled": true,
+            "enabled": true,            
             "pipelineSlug": "elastic-agent",
             "allow_org_users": true,
             "allowed_repo_permissions": ["admin", "write"],
@@ -11,9 +11,30 @@
             "build_on_comment": true,
             "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
             "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
-            "skip_ci_labels": [  ],
+            "skip_ci_labels": [ "skip-ci" ],
             "skip_target_branches": [ ],
+<<<<<<< HEAD
             "skip_ci_on_only_changed": [ ],
+=======
+            "skip_ci_on_only_changed": [ "^.ci/", "^.github/", "^changelog", "^docs/", "\\.md$", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
+            "always_require_ci_on_changed": [ ]
+        },
+        {
+            "enabled": true,
+            "build_drafts": false,
+            "pipelineSlug": "elastic-agent-extended-testing",
+            "allow_org_users": true,
+            "allowed_repo_permissions": ["admin", "write"],
+            "allowed_list": ["dependabot[bot]", "mergify[bot]"],
+            "set_commit_status": true,
+            "build_on_commit": true,
+            "build_on_comment": true,
+            "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$",
+            "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$",
+            "skip_ci_labels": [ "skip-ci", "skip-it" ],
+            "skip_target_branches": [ ],
+            "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"],
+>>>>>>> 0b99ccb922 ([CI] Trigger improvements (#4836))
             "always_require_ci_on_changed": [ ]
         },
         {
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ff84a72f710..ea2a199295f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -88,3 +88,13 @@ Paste here output logs discovered while creating this PR, such as stack traces o
 - How are we going to debug this?
 - What are the metrics I should take care of?
 - ...
+
+<!-- CI Cheatsheet
+Trigger comments:
+/test             (Or `buildkite test this|it`) Triggers unit test pipeline
+/test extended    (Or `buildkite test extended`) Triggers integration test pipeline
+
+PR labels:
+skip-ci           Skips unit and integration tests
+skip-it           Skips integration tests
+-->
\ No newline at end of file

From 8e081786085916dcac52c8aa630367b532416d79 Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Wed, 5 Jun 2024 19:10:26 +0200
Subject: [PATCH 2/2] Fixed conflicts

---
 .buildkite/pull-requests.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json
index adb430bba34..628f46e6172 100644
--- a/.buildkite/pull-requests.json
+++ b/.buildkite/pull-requests.json
@@ -13,9 +13,6 @@
             "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
             "skip_ci_labels": [ "skip-ci" ],
             "skip_target_branches": [ ],
-<<<<<<< HEAD
-            "skip_ci_on_only_changed": [ ],
-=======
             "skip_ci_on_only_changed": [ "^.ci/", "^.github/", "^changelog", "^docs/", "\\.md$", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
             "always_require_ci_on_changed": [ ]
         },
@@ -34,7 +31,6 @@
             "skip_ci_labels": [ "skip-ci", "skip-it" ],
             "skip_target_branches": [ ],
             "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"],
->>>>>>> 0b99ccb922 ([CI] Trigger improvements (#4836))
             "always_require_ci_on_changed": [ ]
         },
         {