From fe6e99f9c814399c97fc13cd7f676f12c79d9409 Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Mon, 3 Jun 2024 12:50:08 +0200 Subject: [PATCH 1/4] [CI] Added .github and .ci directories to skip_ci_on_only_changed --- .buildkite/pull-requests.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index 001d7cd1709..d5587c9ae1a 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -13,7 +13,7 @@ "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$", "skip_ci_labels": [ ], "skip_target_branches": [ ], - "skip_ci_on_only_changed": [ "changelog", "docs", "README.md", "sonar-project.properties", "docker-compose.yml", ".pre-commit-config.yaml", "skaffold.yaml", "Dockerfile.skaffold", "Dockerfile"], + "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"], "always_require_ci_on_changed": [ ] }, { @@ -29,7 +29,7 @@ "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$", "skip_ci_labels": [ ], "skip_target_branches": [ ], - "skip_ci_on_only_changed": [ "changelog", "docs", "README.md", "sonar-project.properties", "docker-compose.yml", ".pre-commit-config.yaml", "skaffold.yaml", "Dockerfile.skaffold", "Dockerfile"], + "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"], "always_require_ci_on_changed": [ ] }, { From fbcf75c69d39e501f1de381d9352314b41092bc4 Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Mon, 3 Jun 2024 12:58:32 +0200 Subject: [PATCH 2/4] [CI] Removed sonar-project.properties from ignored PR changesets --- .buildkite/pull-requests.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index d5587c9ae1a..1d296430b7c 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -13,7 +13,7 @@ "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$", "skip_ci_labels": [ ], "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"], + "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": [ ] }, { From ce2439acf4c7533381f8120e2f12e11372af6a32 Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Mon, 3 Jun 2024 16:39:57 +0200 Subject: [PATCH 3/4] [CI] skip labels and CI cheatsheet --- .buildkite/pull-requests.json | 7 ++++--- .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index 1d296430b7c..628f46e6172 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,13 +11,14 @@ "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": [ ], "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"], @@ -27,7 +28,7 @@ "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_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"], "always_require_ci_on_changed": [ ] diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d4abe0c32ab..b4f574b394b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -69,3 +69,13 @@ Link related issues below. Insert the issue link or reference after the word "Cl - How are we going to debug this? - What are the metrics I should take care of? - ... + + \ No newline at end of file From 705a29e770f3cfab205629b91d6466e15afe0db3 Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Tue, 4 Jun 2024 01:01:53 +0200 Subject: [PATCH 4/4] Added alternative triggers description --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b4f574b394b..3335fee4631 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -72,8 +72,8 @@ Link related issues below. Insert the issue link or reference after the word "Cl