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.

Sign up for GitHub

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

Jump to bottom

fix int options idempotence bug and add new test to check it #5443

Merged
merged 1 commit into from
Nov 1, 2022
Merged

fix int options idempotence bug and add new test to check it #5443

merged 1 commit into from
Nov 1, 2022

Conversation

haddystuff
Copy link
Contributor

SUMMARY

This PR adds fix for #4998 and test this bug.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

plugins/modules/net_tools/nmcli.py

ADDITIONAL INFORMATION

@ansibullbot
Copy link
Collaborator

cc @alcamie101
click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug module module net_tools plugins plugin (any type) tests tests unit tests/unit labels Oct 30, 2022
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-4 labels Oct 30, 2022
felixfontein
felixfontein approved these changes Oct 30, 2022
View reviewed changes
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Looks good! If nobody complains, I'll merge this in a few days.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Nov 1, 2022
@felixfontein felixfontein merged commit dc66aef into ansible-collections:main Nov 1, 2022
@patchback
Copy link

patchback bot commented Nov 1, 2022 •
edited
Loading

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

❌ Failed to cleanly apply dc66aef on top of patchback/backports/stable-4/dc66aefa40ad8457894ff15786bd93d0c0ab2224/pr-5443

Backporting merged PR #5443 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-4/dc66aefa40ad8457894ff15786bd93d0c0ab2224/pr-5443 upstream/stable-4
  4. Now, cherry-pick PR fix int options idempotence bug and add new test to check it #5443 contents into that branch: 
    $ git cherry-pick -x dc66aefa40ad8457894ff15786bd93d0c0ab2224
    If it'll yell at you with something like fatal: Commit dc66aefa40ad8457894ff15786bd93d0c0ab2224 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x dc66aefa40ad8457894ff15786bd93d0c0ab2224
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR fix int options idempotence bug and add new test to check it #5443 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-4/dc66aefa40ad8457894ff15786bd93d0c0ab2224/pr-5443
  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
Copy link
Collaborator

@haddystuff thanks for fixing this!

@patchback
Copy link

patchback bot commented Nov 1, 2022 •
edited
Loading

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/dc66aefa40ad8457894ff15786bd93d0c0ab2224/pr-5443

Backported as #5455

🤖 @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 1, 2022
@haddystuff @patchback
fix int options idempotence bug and add new test to check it (#5443)
b47fb6a 
(cherry picked from commit dc66aef)
@patchback patchback bot mentioned this pull request Nov 1, 2022
Merged
@github-actions
Copy link

github-actions bot commented Nov 1, 2022

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

felixfontein pushed a commit that referenced this pull request Nov 1, 2022
@patchback @haddystuff
fix int options idempotence bug and add new test to check it (#5443) (#…
21423ca 
…5455)

(cherry picked from commit dc66aef)

Co-authored-by: Alex Groshev <[email protected]>
rekup pushed a commit to rekup/community.general that referenced this pull request Nov 3, 2022
@haddystuff @rekup
fix int options idempotence bug and add new test to check it (ansible…
ec72763 
…-collections#5443)
russoz pushed a commit to russoz-ansible/community.general that referenced this pull request Nov 5, 2022
@haddystuff @russoz
fix int options idempotence bug and add new test to check it (ansible…
ed9ed10 
…-collections#5443)
bratwurzt pushed a commit to bratwurzt/community.general that referenced this pull request Nov 7, 2022
@haddystuff
fix int options idempotence bug and add new test to check it (ansible…
b7eb94c 
…-collections#5443)
bratwurzt pushed a commit to bratwurzt/community.general that referenced this pull request Nov 7, 2022
@haddystuff
fix int options idempotence bug and add new test to check it (ansible…
9476611 
…-collections#5443)
russoz pushed a commit to russoz-ansible/community.general that referenced this pull request Nov 10, 2022
@haddystuff @russoz
fix int options idempotence bug and add new test to check it (ansible…
a8c4ba2 
…-collections#5443)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
bug This issue/PR relates to a bug module module net_tools plugins plugin (any type) tests tests unit tests/unit
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@haddystuff @ansibullbot @felixfontein