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

Add RockyLinux support (backport #263) #269

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 6, 2023

This is an automatic backport of pull request #263 done by Mergify.
Cherry-pick of 807bc9c has failed:

On branch mergify/bp/quincy/pr-263
Your branch is ahead of 'origin/quincy' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 807bc9c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cephadm-preflight.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tox.ini

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

Fixes: #241

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit 89f7093)
- Ansible 2.9 is not supported since May 2022
- requirements versions filter removed to use latest versions

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit e4cb989)
@mergify mergify bot added the conflicts label Dec 6, 2023
Also modify tox.ini to be able to update packages on rhel and
ubuntu based OS

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit 807bc9c)
@asm0deuz asm0deuz force-pushed the mergify/bp/quincy/pr-263 branch from 637f15c to 6bab922 Compare December 18, 2023 15:23
@asm0deuz asm0deuz merged commit 5015e1a into quincy Dec 18, 2023
9 checks passed
@asm0deuz asm0deuz deleted the mergify/bp/quincy/pr-263 branch December 18, 2023 18:07
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.

1 participant