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

Port pkgrepo and pkg support for Photon OS #58856

Merged
merged 7 commits into from Feb 4, 2021

Conversation

oeuftete
Copy link
Contributor

@oeuftete oeuftete commented Nov 1, 2020

What does this PR do?

Ports @lomeroe's #51912 and #52550, which added pkg and pkgrepo support, respectively, for VMWare's Photon OS.

Merge requirements satisfied?

Other todos

  • grain to match is VMware Photon OS for 3.0 at least
  • need to handle/disable hold/unhold
  • ? maybe pull in add PhotonOS 3.0 #58918 locally to help testing

Commits signed with GPG?

No

@sagetherage sagetherage added this to PR needs merge to master in PRs to port to master via automation Nov 10, 2020
@sagetherage sagetherage added the Aluminium Release Post Mg and Pre Si label Nov 10, 2020
@sagetherage sagetherage added this to the Aluminium milestone Nov 10, 2020
@oeuftete oeuftete mentioned this pull request Nov 22, 2020
3 tasks
@oeuftete oeuftete force-pushed the photonos-ports branch 3 times, most recently from 0820bbc to 14c0ade Compare November 23, 2020 02:15
@oeuftete oeuftete marked this pull request as ready for review November 23, 2020 02:16
@oeuftete oeuftete requested a review from a team as a code owner November 23, 2020 02:16
@oeuftete oeuftete requested review from s0undt3ch and removed request for a team November 23, 2020 02:16
dwoz
dwoz previously approved these changes Nov 24, 2020
salt/modules/rpm_lowpkg.py Outdated Show resolved Hide resolved
salt/modules/rpm_lowpkg.py Outdated Show resolved Hide resolved
s0undt3ch
s0undt3ch previously approved these changes Nov 24, 2020
@whytewolf
Copy link
Contributor

Just my own two cents about this PR, Since proton, isn't its own os_family but is a Redhat variant. the os_family should be mapped to RedHat. This will make a lot of these changes have less bite as well as making the tests easier as not as many changes are needed.

@@ -55,7 +55,7 @@ def __virtual__():
"The rpm execution module failed to load: failed to detect os or os_family grains.",
)

enabled = ("amazon", "xcp", "xenserver", "VirtuozzoLinux")
enabled = ("amazon", "xcp", "xenserver", "virtuozzolinux")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not directly related to this PR, but found this to be incorrect along the way.

@oeuftete
Copy link
Contributor Author

Just my own two cents about this PR, Since proton, isn't its own os_family but is a Redhat variant. the os_family should be mapped to RedHat. This will make a lot of these changes have less bite as well as making the tests easier as not as many changes are needed.

Thanks @whytewolf, I think this is the right approach. I've made the fixes.

@lomeroe
Copy link
Contributor

lomeroe commented Dec 22, 2020

The changelog definitely needs to mention that photon will now have an os_family of "RedHat". Anyone like me using "VMware Photon OS" or "VMware Photon" in a default "grains.filter_by" statement will start getting unexpected results with that portion of the update.

s0undt3ch
s0undt3ch previously approved these changes Dec 22, 2020
@s0undt3ch
Copy link
Member

The changelog definitely needs to mention that photon will now have an os_family of "RedHat". Anyone like me using "VMware Photon OS" or "VMware Photon" in a default "grains.filter_by" statement will start getting unexpected results with that portion of the update

Actually, besides mentioning this on the changelog, it's worthy of a release notes entry.

https://github.com/saltstack/salt/blob/master/doc/topics/releases/3003.rst

@oeuftete
Copy link
Contributor Author

oeuftete commented Dec 22, 2020

The changelog definitely needs to mention that photon will now have an os_family of "RedHat". Anyone like me using "VMware Photon OS" or "VMware Photon" in a default "grains.filter_by" statement will start getting unexpected results with that portion of the update.

@lomeroe @s0undt3ch Good feedback, thanks. I've added additional docs in 09b500a8a9.

s0undt3ch
s0undt3ch previously approved these changes Jan 4, 2021
@Ch3LL
Copy link
Contributor

Ch3LL commented Feb 4, 2021

Looks like there is a merge conflict here @oeuftete

@oeuftete
Copy link
Contributor Author

oeuftete commented Feb 4, 2021

Looks like there is a merge conflict here @oeuftete

Thanks for the reminder @Ch3LL. Hopefully this rebase is the last one. :)

Edit 1: after all that, I think I just rebased from an old local branch... aargh
Edit 2: rebased again from what was the previous current branch (36aefcf)

lomeroe and others added 4 commits February 4, 2021 09:48
The value is "VMware Photon" only on Photon OS 1.0, where there is no
python3 package available, so I think it's fair to ignore that.
@Ch3LL Ch3LL requested a review from s0undt3ch February 4, 2021 17:16
@Ch3LL Ch3LL merged commit 8a017c3 into saltstack:master Feb 4, 2021
PRs to port to master automation moved this from PR needs merge to master to PR merged Feb 4, 2021
@oeuftete oeuftete deleted the photonos-ports branch February 5, 2021 01:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Aluminium Release Post Mg and Pre Si master-port
Projects
Development

Successfully merging this pull request may close these issues.

None yet

7 participants