Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid blocking openQA jobs on Git updates #6055

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Add tests for `git_auto_update_method = strict`

eed9dd8
Select commit
Loading
Failed to load commit list.
Open

Avoid blocking openQA jobs on Git updates #6055

Add tests for `git_auto_update_method = strict`
eed9dd8
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Nov 14, 2024 in 1s

3 potential rules

Rule: automatic merge (merge)

  • all of:
    • #approved-reviews-by>=2
    • #changes-requested-reviews-by=0
    • #review-requested=0
  • -closed [📌 merge requirement]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • all of:
    • #check-failure=0
    • #check-pending=0
    • #check-success>=45
    • -label~=^acceptance-tests-needed|not-ready
    • base=master
    • linear-history
    • status-success=codecov/patch
    • status-success=codecov/project
    • status-success=static-check-containers
    • status-success=webui-docker-compose
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🛡 GitHub branch protection]
    • check-success = WIP
    • check-neutral = WIP
    • check-skipped = WIP
  • any of: [🛡 GitHub branch protection]
    • check-success = ci/circleci: api
    • check-neutral = ci/circleci: api
    • check-skipped = ci/circleci: api
  • any of: [🛡 GitHub branch protection]
    • check-success = ci/circleci: ui
    • check-neutral = ci/circleci: ui
    • check-skipped = ci/circleci: ui

Rule: automatic merge on special label (merge)

  • label=merge-fast
  • -closed [📌 merge requirement]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • all of:
    • #check-failure=0
    • #check-pending=0
    • #check-success>=45
    • -label~=^acceptance-tests-needed|not-ready
    • base=master
    • linear-history
    • status-success=codecov/patch
    • status-success=codecov/project
    • status-success=static-check-containers
    • status-success=webui-docker-compose
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🛡 GitHub branch protection]
    • check-success = WIP
    • check-neutral = WIP
    • check-skipped = WIP
  • any of: [🛡 GitHub branch protection]
    • check-success = ci/circleci: api
    • check-neutral = ci/circleci: api
    • check-skipped = ci/circleci: api
  • any of: [🛡 GitHub branch protection]
    • check-success = ci/circleci: ui
    • check-neutral = ci/circleci: ui
    • check-skipped = ci/circleci: ui

Rule: ask to resolve conflict (comment)

  • conflict

💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!


3 not applicable rules

Rule: automatic merge for dependency bot updates (merge)

  • author~=^os-autoinst-bot$
  • -closed [📌 merge requirement]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • all of:
    • #check-failure=0
    • #check-pending=0
    • #check-success>=45
    • -label~=^acceptance-tests-needed|not-ready
    • base=master
    • linear-history
    • status-success=codecov/patch
    • status-success=codecov/project
    • status-success=static-check-containers
    • status-success=webui-docker-compose
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🛡 GitHub branch protection]
    • check-success = WIP
    • check-neutral = WIP
    • check-skipped = WIP
  • any of: [🛡 GitHub branch protection]
    • check-success = ci/circleci: api
    • check-neutral = ci/circleci: api
    • check-skipped = ci/circleci: api
  • any of: [🛡 GitHub branch protection]
    • check-success = ci/circleci: ui
    • check-neutral = ci/circleci: ui
    • check-skipped = ci/circleci: ui

Rule: automatic merge for dependabot updates (merge)

  • all of:
    • author=dependabot[bot]
    • base=main
    • label=waited
  • -closed [📌 merge requirement]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • all of:
    • #check-failure=0
    • #check-pending=0
    • #check-success>=45
    • -label~=^acceptance-tests-needed|not-ready
    • base=master
    • linear-history
    • status-success=codecov/patch
    • status-success=codecov/project
    • status-success=static-check-containers
    • status-success=webui-docker-compose
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🛡 GitHub branch protection]
    • check-success = WIP
    • check-neutral = WIP
    • check-skipped = WIP
  • any of: [🛡 GitHub branch protection]
    • check-success = ci/circleci: api
    • check-neutral = ci/circleci: api
    • check-skipped = ci/circleci: api
  • any of: [🛡 GitHub branch protection]
    • check-success = ci/circleci: ui
    • check-neutral = ci/circleci: ui
    • check-skipped = ci/circleci: ui

Rule: Wait for 2 days before validating merge (label)

  • all of:
    • author=dependabot[bot]
    • updated-at<2 days ago
Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com