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 redfish processor architecture to Redfish CPU inventory #6864

Merged
merged 3 commits into from
Jul 7, 2023
Merged

Add redfish processor architecture to Redfish CPU inventory #6864

merged 3 commits into from
Jul 7, 2023

Conversation

pyfontan
Copy link
Contributor

@pyfontan pyfontan commented Jul 6, 2023

SUMMARY

This update adds ProcessorArchitecture to redfish CPU inventory

Fixes #6863

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

community.general.redfish_info

ADDITIONAL INFORMATION

@pyfontan pyfontan changed the base branch from main to stable-7 July 6, 2023 14:42
@ansibullbot
Copy link
Collaborator

@ansibullbot ansibullbot added backport feature This issue/PR relates to a feature request module_utils module_utils new_contributor Help guide this first time contributor plugins plugin (any type) small_patch Hopefully easy to review labels Jul 6, 2023
@mraineri
Copy link
Contributor

mraineri commented Jul 6, 2023

Other than the missing changelog fragment, this looks good to me!

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

Thanks for your contribution! You can find infos on changelog fragments here: https://docs.ansible.com/ansible/devel/community/collection_development_process.html#creating-a-changelog-fragment

@pyfontan
Copy link
Contributor Author

pyfontan commented Jul 7, 2023

Thank you,

I hope that d303457 will be ok.

@ansibullbot ansibullbot removed the small_patch Hopefully easy to review label Jul 7, 2023
Co-authored-by: Felix Fontein <felix@fontein.de>
@pyfontan
Copy link
Contributor Author

pyfontan commented Jul 7, 2023

@felixfontein Thank you for your suggestion

@felixfontein felixfontein merged commit 4259792 into ansible-collections:stable-7 Jul 7, 2023
@patchback
Copy link

patchback bot commented Jul 7, 2023

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

❌ Failed to cleanly apply 4259792 on top of patchback/backports/stable-7/4259792751e72f5a622a4cfaf76d03381466a9e3/pr-6864

Backporting merged PR #6864 into stable-7

  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-7/4259792751e72f5a622a4cfaf76d03381466a9e3/pr-6864 upstream/stable-7
  4. Now, cherry-pick PR Add redfish processor architecture to Redfish CPU inventory #6864 contents into that branch:
    $ git cherry-pick -x 4259792751e72f5a622a4cfaf76d03381466a9e3
    If it'll yell at you with something like fatal: Commit 4259792751e72f5a622a4cfaf76d03381466a9e3 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 4259792751e72f5a622a4cfaf76d03381466a9e3
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add redfish processor architecture to Redfish CPU inventory #6864 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-7/4259792751e72f5a622a4cfaf76d03381466a9e3/pr-6864
  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 Jul 7, 2023
@felixfontein
Copy link
Collaborator

@pyfontan thanks for your contribution!
@mraineri thanks for reviewing!

felixfontein added a commit that referenced this pull request Jul 7, 2023
* Add Processor Architecture to CPU Inventory details

* Add changelog fragment

* Changelog fragment writing guide formatting

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

---------

Co-authored-by: Pierre-yves FONTANIERE <pyf@cc.in2p3.fr>
Co-authored-by: Felix Fontein <felix@fontein.de>
@felixfontein
Copy link
Collaborator

Please open a PR against main the next time. I only now noticed it was against stable-7 and not main... I cherry-picked the commit to main for this time.

@pyfontan
Copy link
Contributor Author

Please open a PR against main the next time. I only now noticed it was against stable-7 and not main... I cherry-picked the commit to main for this time.

@felixfontein Sure, i will.
Sorry for the inconvenience.

@felixfontein
Copy link
Collaborator

@pyfontan no worries, it's also my fault - I totally overlooked it :D And thanks again for contributing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature This issue/PR relates to a feature request module_utils module_utils new_contributor Help guide this first time contributor plugins plugin (any type)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Get processor architecture from Redfish CPU inventory
4 participants