diff --git a/.mergify.yml b/.mergify.yml index c9fc663a0fa..08dc2ecc29a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -19,35 +19,42 @@ defaults: labels: - "backport" pull_request_rules: - - name: automatic approval for updatecli pull requests with changes in .buildkite + - name: automatic approval for updatecli pull requests with changes in .buildkite or create_deployment_csp_configuration.yaml conditions: - author=github-actions[bot] - check-success=buildkite/elastic-agent - - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$ + - or: + - files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$ + - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$ - head~=^updatecli_.* actions: review: type: APPROVE message: Automatically approving mergify - - name: automatic squash and merge with success checks and the files matching the regex .buildkite is modified. + - name: automatic squash and merge with success checks and the files matching the regex .buildkite or create_deployment_csp_configuration.yaml is modified. conditions: - author=github-actions[bot] - check-success=buildkite/elastic-agent - - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml|.buildkite/bk.integration-fips.pipeline.yml)$ + - or: + - files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$ + - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$ - head~=^updatecli_.* - "#approved-reviews-by>=1" actions: queue: name: default - - name: rebase pull requests for the VM autobump + - name: rebase pull requests for the VM autobump and ESS version pinning conditions: - author=github-actions[bot] - - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml|.buildkite/bk.integration-fips.pipeline.yml)$ + - or: + - files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$ + - files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$ - head~=^updatecli_.* - "#check-failure>0" - - schedule=Tue-Fri 04:00-06:00[Europe/Paris] + - schedule=Mon-Fri 04:00-06:00[Europe/Paris] actions: rebase: + - name: self-assign PRs conditions: - -merged