From e7e1218588afd2d5b9e32cbf88332f64debe4919 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Tue, 23 Sep 2025 13:59:45 +0300 Subject: [PATCH 1/9] updated pull-request.json --- .buildkite/pull-requests.json | 89 +++++++++++++------ .../logstash-filter-acceptance_test.gemspec | 2 +- 2 files changed, 65 insertions(+), 26 deletions(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index 2414a75b5b6..bc5861ad3ce 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -1,26 +1,65 @@ { - "jobs": [ - { - "enabled": true, - "pipeline_slug": "logstash-pull-request-pipeline", - "allow_org_users": true, - "allowed_repo_permissions": ["admin", "write"], - "allowed_list": ["dependabot[bot]", "mergify[bot]", "github-actions[bot]", "elastic-vault-github-plugin-prod[bot]"], - "set_commit_status": true, - "build_on_commit": true, - "build_on_comment": true, - "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", - "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", - "skip_ci_labels": [ ], - "skip_target_branches": [ ], - "skip_ci_on_only_changed": [ - "^.github/", - "^docs/", - "^.mergify.yml$", - "^.pre-commit-config.yaml", - "\\.md$" - ], - "always_require_ci_on_changed": [ ] - } - ] - } + "jobs": [ + { + "enabled": true, + "pipeline_slug": "logstash-pull-request-pipeline", + "allow_org_users": true, + "allowed_repo_permissions": [ + "admin", + "write" + ], + "allowed_list": [ + "dependabot[bot]", + "mergify[bot]", + "github-actions[bot]", + "elastic-vault-github-plugin-prod[bot]" + ], + "set_commit_status": true, + "build_on_commit": true, + "build_on_comment": true, + "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", + "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))", + "skip_ci_labels": [], + "skip_target_branches": [], + "skip_ci_on_only_changed": [ + "^.github/", + "^docs/", + "^.mergify.yml$", + "^.pre-commit-config.yaml", + "\\.md$" + ], + "always_require_ci_on_changed": [] + }, + { + "enabled": true, + "pipeline_slug": "logstash-exhaustive-tests-pipeline", + "allow_org_users": true, + "allowed_repo_permissions": [ + "admin", + "write" + ], + "allowed_list": [ + "dependabot[bot]", + "mergify[bot]", + "github-actions[bot]", + ], + "set_commit_status": true, + "build_on_commit": true, + "build_on_comment": true, + "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:exhaustive)\\W+(?:this|it))|^/exhaustive$", + "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:exhaustive)\\W+(?:this|it))|^/exhaustive$", + "skip_ci_labels": [], + "skip_target_branches": [], + "skip_ci_on_only_changed": [ + "^.github/", + "^docs/", + "^.mergify.yml$", + "^.pre-commit-config.yaml", + "\\.md$" + ], + "always_require_ci_on_changed": [ + "^qa/acceptance/" + ] + } + ] +} diff --git a/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec b/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec index 924a341cf66..c2a53932d6e 100644 --- a/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec +++ b/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec @@ -16,4 +16,4 @@ Gem::Specification.new do |s| s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" } # Gem dependencies s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99" - end \ No newline at end of file + end From 4b19fe5c9e0a86416d5cbdebc3232b24ce22dc14 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Tue, 23 Sep 2025 15:42:39 +0300 Subject: [PATCH 2/9] restored the qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec --- qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec b/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec index c2a53932d6e..924a341cf66 100644 --- a/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec +++ b/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec @@ -16,4 +16,4 @@ Gem::Specification.new do |s| s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" } # Gem dependencies s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99" - end + end \ No newline at end of file From eb8c8e41c66f44a2f30e180deac3ad50d3baca52 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Tue, 23 Sep 2025 15:47:20 +0300 Subject: [PATCH 3/9] cleaned always_require_ci_on_changed values after testing --- .buildkite/pull-requests.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index bc5861ad3ce..eb962ca862c 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -41,7 +41,7 @@ "allowed_list": [ "dependabot[bot]", "mergify[bot]", - "github-actions[bot]", + "github-actions[bot]" ], "set_commit_status": true, "build_on_commit": true, @@ -57,9 +57,7 @@ "^.pre-commit-config.yaml", "\\.md$" ], - "always_require_ci_on_changed": [ - "^qa/acceptance/" - ] + "always_require_ci_on_changed": [] } ] } From 53323ab51cca01b060dd94b0a01b608476138eee Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Tue, 23 Sep 2025 16:32:00 +0300 Subject: [PATCH 4/9] updated the trigger comment --- .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 eb962ca862c..50026e376f2 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -46,8 +46,8 @@ "set_commit_status": true, "build_on_commit": true, "build_on_comment": true, - "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:exhaustive)\\W+(?:this|it))|^/exhaustive$", - "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:exhaustive)\\W+(?:this|it))|^/exhaustive$", + "trigger_comment_regex": "^(?:(?:run\\W+)?(?:exhaustive)\\W+(?:tests))", + "always_trigger_comment_regex": "^(?:(?:run\\W+)?(?:exhaustive)\\W+(?:tests))", "skip_ci_labels": [], "skip_target_branches": [], "skip_ci_on_only_changed": [ From e7b622b2a7112e695670519de64366466125ff9f Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Tue, 23 Sep 2025 16:46:18 +0300 Subject: [PATCH 5/9] updated the trigger comment --- .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 50026e376f2..8f644b64cb6 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -46,8 +46,8 @@ "set_commit_status": true, "build_on_commit": true, "build_on_comment": true, - "trigger_comment_regex": "^(?:(?:run\\W+)?(?:exhaustive)\\W+(?:tests))", - "always_trigger_comment_regex": "^(?:(?:run\\W+)?(?:exhaustive)\\W+(?:tests))", + "trigger_comment_regex": "^(?:(?:/run\\W+)?(?:exhaustive)\\W+(?:tests))", + "always_trigger_comment_regex": "^(?:(?:/run\\W+)?(?:exhaustive)\\W+(?:tests))", "skip_ci_labels": [], "skip_target_branches": [], "skip_ci_on_only_changed": [ From 6836cbee24f4bae152693e42ae8ca3bda5d235fd Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Wed, 24 Sep 2025 11:56:46 +0300 Subject: [PATCH 6/9] testing comments --- .buildkite/pull-requests.json | 2 +- qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index 8f644b64cb6..1b97b84c935 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -57,7 +57,7 @@ "^.pre-commit-config.yaml", "\\.md$" ], - "always_require_ci_on_changed": [] + "always_require_ci_on_changed": ["^qa/acceptance"] } ] } diff --git a/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec b/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec index 924a341cf66..c2a53932d6e 100644 --- a/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec +++ b/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec @@ -16,4 +16,4 @@ Gem::Specification.new do |s| s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" } # Gem dependencies s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99" - end \ No newline at end of file + end From 5f31a13ea018d02c19c520f443e52dd274641309 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Wed, 24 Sep 2025 11:58:09 +0300 Subject: [PATCH 7/9] testing comments --- .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 1b97b84c935..7f2df185f6e 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -57,7 +57,7 @@ "^.pre-commit-config.yaml", "\\.md$" ], - "always_require_ci_on_changed": ["^qa/acceptance"] + "always_require_ci_on_changed": ["^qa/acceptance/"] } ] } From 66f5eba0662a7d3f9c7ef49305761f1dbe36c5f9 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Wed, 24 Sep 2025 12:06:01 +0300 Subject: [PATCH 8/9] testing comments --- .buildkite/pull-requests.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index 7f2df185f6e..f369e28aac9 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -57,7 +57,9 @@ "^.pre-commit-config.yaml", "\\.md$" ], - "always_require_ci_on_changed": ["^qa/acceptance/"] + "always_require_ci_on_changed": [ + "^qa/acceptance/" + ] } ] } From 8060880db5deb2314f075c117ebf73dbfc63a7e3 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Thu, 25 Sep 2025 13:46:30 +0300 Subject: [PATCH 9/9] updated pull-request.json --- .buildkite/pull-requests.json | 6 ++---- .../fixtures/logstash-filter-acceptance_test.gemspec | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index f369e28aac9..309dc75ad17 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -44,7 +44,7 @@ "github-actions[bot]" ], "set_commit_status": true, - "build_on_commit": true, + "build_on_commit": false, "build_on_comment": true, "trigger_comment_regex": "^(?:(?:/run\\W+)?(?:exhaustive)\\W+(?:tests))", "always_trigger_comment_regex": "^(?:(?:/run\\W+)?(?:exhaustive)\\W+(?:tests))", @@ -57,9 +57,7 @@ "^.pre-commit-config.yaml", "\\.md$" ], - "always_require_ci_on_changed": [ - "^qa/acceptance/" - ] + "always_require_ci_on_changed": [] } ] } diff --git a/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec b/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec index c2a53932d6e..924a341cf66 100644 --- a/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec +++ b/qa/acceptance/fixtures/logstash-filter-acceptance_test.gemspec @@ -16,4 +16,4 @@ Gem::Specification.new do |s| s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" } # Gem dependencies s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99" - end + end \ No newline at end of file