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

rax_scaling_group: fix sanity check #5563

Merged

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Nov 16, 2022

SUMMARY

Fix module's sanity checks.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

plugins/modules/rax_scaling_group.py

@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-5 labels Nov 16, 2022
@ansibullbot ansibullbot added bug This issue/PR relates to a bug cloud module module module_utils module_utils plugins plugin (any type) tests tests labels Nov 16, 2022
@felixfontein felixfontein merged commit 6a03108 into ansible-collections:main Nov 16, 2022
@patchback
Copy link

patchback bot commented Nov 16, 2022

Backport to stable-5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 6a03108 on top of patchback/backports/stable-5/6a03108609cba48b88b57d2bf43eb238fc13f229/pr-5563

Backporting merged PR #5563 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-5/6a03108609cba48b88b57d2bf43eb238fc13f229/pr-5563 upstream/stable-5
  4. Now, cherry-pick PR rax_scaling_group: fix sanity check #5563 contents into that branch:
    $ git cherry-pick -x 6a03108609cba48b88b57d2bf43eb238fc13f229
    If it'll yell at you with something like fatal: Commit 6a03108609cba48b88b57d2bf43eb238fc13f229 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 6a03108609cba48b88b57d2bf43eb238fc13f229
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR rax_scaling_group: fix sanity check #5563 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-5/6a03108609cba48b88b57d2bf43eb238fc13f229/pr-5563
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Nov 16, 2022
@felixfontein
Copy link
Collaborator

@russoz thanks!

@patchback
Copy link

patchback bot commented Nov 16, 2022

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/6a03108609cba48b88b57d2bf43eb238fc13f229/pr-5563

Backported as #5569

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Nov 16, 2022
* rax_scaling_group: fix sanity check

* add changelog fragment

* added missing call to expanduser()

(cherry picked from commit 6a03108)
@russoz russoz deleted the rax-scaling-group-sanity branch November 16, 2022 21:09
felixfontein pushed a commit that referenced this pull request Nov 23, 2022
* rax_scaling_group: fix sanity check

* add changelog fragment

* added missing call to expanduser()

(cherry picked from commit 6a03108)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
russoz added a commit to russoz-ansible/community.general that referenced this pull request Nov 27, 2022
* rax_scaling_group: fix sanity check

* add changelog fragment

* added missing call to expanduser()
russoz added a commit to russoz-ansible/community.general that referenced this pull request Nov 27, 2022
* rax_scaling_group: fix sanity check

* add changelog fragment

* added missing call to expanduser()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue/PR relates to a bug cloud module_utils module_utils module module plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants