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

kernel_blacklist: bugfix #7382

Merged

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Oct 10, 2023

SUMMARY

Simplify the way the file is updated, preventing the errors with attributes.

Fixes #7362 .

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

kernel_blacklist

@ansibullbot ansibullbot added WIP Work in progress bug This issue/PR relates to a bug integration tests/integration tests tests labels Oct 10, 2023
@russoz
Copy link
Collaborator Author

russoz commented Oct 10, 2023

/rebuild

@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-6 labels Oct 11, 2023
@ansibullbot
Copy link
Collaborator

cc @matze
click here for bot help

@ansibullbot ansibullbot added module module plugins plugin (any type) labels Oct 11, 2023
@russoz russoz changed the title [WIP] kernel_blacklist: bugfix kernel_blacklist: bugfix Oct 11, 2023
@ansibullbot ansibullbot removed the WIP Work in progress label Oct 11, 2023
Co-authored-by: Felix Fontein <felix@fontein.de>
@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Oct 18, 2023
@felixfontein felixfontein merged commit 33133f3 into ansible-collections:main Oct 18, 2023
@patchback
Copy link

patchback bot commented Oct 18, 2023

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

❌ Failed to cleanly apply 33133f3 on top of patchback/backports/stable-6/33133f3ba9864e965f7b7ce002485f867606b009/pr-7382

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

@russoz thanks for your contribution!

@patchback
Copy link

patchback bot commented Oct 18, 2023

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/33133f3ba9864e965f7b7ce002485f867606b009/pr-7382

Backported as #7409

🤖 @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 Oct 18, 2023
* kernel_blacklist: bugfix

* add fix + changelog frag

* skip aix,freebsd,macos,osx in integration test

* Update changelogs/fragments/7382-kernel-blacklist-bugfix.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 33133f3)
felixfontein pushed a commit that referenced this pull request Oct 18, 2023
kernel_blacklist: bugfix (#7382)

* kernel_blacklist: bugfix

* add fix + changelog frag

* skip aix,freebsd,macos,osx in integration test

* Update changelogs/fragments/7382-kernel-blacklist-bugfix.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 33133f3)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
@russoz russoz deleted the 7362-kernel-blacklist branch October 18, 2023 21:25
etrombly pushed a commit to etrombly/community.general that referenced this pull request Oct 25, 2023
* kernel_blacklist: bugfix

* add fix + changelog frag

* skip aix,freebsd,macos,osx in integration test

* Update changelogs/fragments/7382-kernel-blacklist-bugfix.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
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 integration tests/integration module module plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kernel_blacklist - Error while setting attributes: /tmp/xyz: Operation not supported
3 participants