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

Fall back to old way of getting osrelease grain if new way fails #52344

Merged
merged 1 commit into from Mar 28, 2019

Conversation

@twangboy
Copy link
Contributor

commented Mar 27, 2019

What does this PR do?

Falls back to the old way of getting osrelease if the new way doesn't detect it. The new way wasn't detecting embedded versions of Windows correctly as they have no version number in the caption.
Adds some tests to make sure it's all working

What issues does this PR fix or reference?

#52339

Tests written?

Yes

Commits signed with GPG?

Yes

@dwoz
dwoz approved these changes Mar 27, 2019
@andzn
andzn approved these changes Mar 28, 2019
Copy link

left a comment

Thanks!

@dwoz dwoz merged commit 10d041b into saltstack:2018.3 Mar 28, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@twangboy twangboy deleted the twangboy:os_release_embedded branch Mar 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.