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

Fix incomplete switch to policy.yaml (backport #1270) #1271

Merged
merged 1 commit into from
Sep 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 5, 2022

This is an automatic backport of pull request #1270 done by Mergify.
Cherry-pick of 87ef6cd has failed:

On branch mergify/bp/stable/4.4/pr-1270
Your branch is up to date with 'origin/stable/4.4'.

You are currently cherry-picking commit 87ef6cd2.
  (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:   gnocchi/cli/api.py

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

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

Commit 0d610f6 was supposed to switch
default policy file from policy.json to policy.yaml but that change
was incomplete and still the old policy.json is searched first.

This change fixes it and ensures policy.yaml is loaded first.

(cherry picked from commit 87ef6cd)
@tobias-urdin tobias-urdin force-pushed the mergify/bp/stable/4.4/pr-1270 branch from 3f8cba0 to a53fcfc Compare September 6, 2022 07:02
@tobias-urdin tobias-urdin merged commit cb866ee into stable/4.4 Sep 6, 2022
@jcapiitao
Copy link

oslo.policy is currently pin to 3.8.3 in Xena https://github.com/openstack/requirements/blob/6be7f21cdc8002f797b421303282ae3fd03af487/upper-constraints.txt#L487

So as a result this commit fails in RDO CI

@tobias-urdin
Copy link
Contributor

Reverting in #1272

@gnocchixyz gnocchixyz deleted a comment from mergify bot Sep 6, 2022
@tobias-urdin tobias-urdin deleted the mergify/bp/stable/4.4/pr-1270 branch September 5, 2023 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants