Skip to content

chore(renovate): Don't automatically rebase - #764

Merged
cbartz merged 1 commit into
mainfrom
chore/renovate-never-rebase
Mar 24, 2026
Merged

cbartz merged 1 commit into
mainfrom
chore/renovate-never-rebase

Conversation

@cbartz

@cbartz cbartz commented Mar 23, 2026

Copy link
Copy Markdown
Collaborator

Overview

Configure renovate to not rebase when a branch is behind main.

Rationale

Renovate does update a branch when configured to automerge.
The CI in this repository is quite expensive at the moment, triggering multiple integration test runs targetting real Openstack resources per every PR commit push.

When there are multiple PR's open, this increases the flakiness of the CI (e.g., the different PR executions compete with quota) and also leads to wasted CI runs (because only 1 PR "can win").

Checklist

  • The charm style guide was applied.
  • The contributing guide was applied.
  • The changes are compliant with ISD054 - Managing Charm Complexity
  • The documentation for charmhub is updated.
  • The PR is tagged with appropriate label (urgent, trivial, complex).
  • The changelog is updated with changes that affects the users of the charm.
  • The application version number is updated in github-runner-manager/pyproject.toml.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Configures Renovate to avoid automatically rebasing update branches when they fall behind main, reducing redundant CI runs and contention for expensive OpenStack-backed integration tests.

Changes:

  • Set Renovate’s rebaseWhen behavior to never to prevent automatic rebases while keeping automerge enabled.

@cbartz
cbartz enabled auto-merge (squash) March 24, 2026 06:08
@cbartz
cbartz merged commit 12ac7ad into main Mar 24, 2026
119 of 127 checks passed
@cbartz
cbartz deleted the chore/renovate-never-rebase branch March 24, 2026 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants