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

Make distro.id() report newer versions of OpenSuSE (at least >=15) also report as opensuse #76121

Merged
merged 2 commits into from
Jul 27, 2022
Merged

Make distro.id() report newer versions of OpenSuSE (at least >=15) also report as opensuse #76121

merged 2 commits into from
Jul 27, 2022

Conversation

rpluem-vf
Copy link
Contributor

SUMMARY

Make distro.id() report newer versions of OpenSuSE (at least >=15) also report
as opensuse. They report themselves as opensuse-leap.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

module_utils/distro

ADDITIONAL INFORMATION

@rpluem-vf
Report OpenSuSE >= 15 as opensuse
fd1a940 
Make distro.id() report newer versions of OpenSuSE (at least >=15) also report
as opensuse. They report themselves as opensuse-leap.
@ansibot ansibot added affects_2.13 bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. needs_triage Needs a first human triage before being processed. support:core This issue/PR relates to code supported by the Ansible Engineering Team. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Oct 22, 2021
@rpluem-vf rpluem-vf mentioned this pull request Oct 25, 2021
Closed
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. labels Oct 25, 2021
@rpluem-vf rpluem-vf force-pushed the fix_opensuse_disto_id branch from 818362b to fd1a940 Compare October 25, 2021 09:21
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Oct 25, 2021
@sivel
Copy link
Member

sivel commented Oct 25, 2021

This change needs to be submitted upstream at https://github.com/python-distro/distro

After which, we can look at vendoring the updated copy.

We can accept some normalization code into lib/ansible/module_utils/common/sys_info.py which would then require the use of those functions instead of directly using distro.id

@rpluem-vf
Copy link
Contributor Author

Do I understand correctly that lib/ansible/module_utils/distro/ is some sort of 'vendor' branch from https://github.com/python-distro/distro which you imported into the Ansible repository and hence the request for doing a PR upstream?

@sivel
Copy link
Member

sivel commented Oct 25, 2021

Yes, the lib/ansible/module_utils/distro/_distro.py file is a vendored copy of the upstream distro project.

@rpluem-vf
Copy link
Contributor Author

Opened a PR upstream: python-distro/distro#319 . Let's wait and see.

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Oct 25, 2021
Akasurde
Akasurde previously requested changes Oct 26, 2021
View reviewed changes
lib/ansible/module_utils/distro/_distro.py Show resolved Hide resolved
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Oct 26, 2021
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Oct 26, 2021
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Oct 26, 2021
@rpluem-vf rpluem-vf requested a review from Akasurde October 26, 2021 12:45
@bcoca bcoca removed the needs_triage Needs a first human triage before being processed. label Oct 26, 2021
@rpluem-vf
Copy link
Contributor Author

rpluem-vf commented Oct 27, 2021 •
edited
Loading

python-distro/distro#319 is now merged as python-distro/distro@dd1a802 and it will become part of 1.6.1.

@ansibot ansibot added stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. stale_review Updates were made after the last review and the last review is more than 7 days old. labels Nov 4, 2021
@HorlogeSkynet
Copy link

Hi, just a ping to notify you distro v1.7.0 is out, including your fix.
Bye 👋

@sivel sivel mentioned this pull request Feb 15, 2022
Closed
1 task
@jborean93
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. stale_review Updates were made after the last review and the last review is more than 7 days old. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. stale_review Updates were made after the last review and the last review is more than 7 days old. core_review In order to be merged, this PR must follow the core review workflow. labels Jul 27, 2022
@jborean93 jborean93 dismissed Akasurde’s stale review July 27, 2022 20:21

tests were added

@jborean93 jborean93 merged commit 0ef1376 into ansible:devel Jul 27, 2022
@ansible ansible locked and limited conversation to collaborators Aug 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Akasurde Akasurde Awaiting requested review from Akasurde

Assignees
No one assigned
Labels
affects_2.13 bug This issue/PR relates to a bug. has_issue needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. stale_review Updates were made after the last review and the last review is more than 7 days old. support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@rpluem-vf @sivel @HorlogeSkynet @jborean93 @Akasurde @bcoca @ansibot