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

Fix win system #53287

Merged
merged 4 commits into from Jun 6, 2019

Conversation

@twangboy
Copy link
Contributor

commented May 28, 2019

What does this PR do?

Skip processor_cores_enabled as it's not available
Get ChassisSKUNumber using the ComputerSystemProduct class
Add a note stating that unsupported info is skipped

What issues does this PR fix or reference?

saltstack/lock#1288

Tests written?

No

Commits signed with GPG?

Yes

@dwoz
dwoz approved these changes May 29, 2019
@twangboy twangboy added the 2019.2.1 label May 29, 2019
@twangboy twangboy force-pushed the twangboy:fix_win_system branch from 8d3503c to d3d724b Jun 4, 2019
twangboy added 4 commits May 28, 2019
Skip processor_cores_enabled as it's not available
Get ChassisSKUNumber using the ComputerSystemProduct class
Use a try/except block instead of comparing versions
@twangboy twangboy force-pushed the twangboy:fix_win_system branch from 5bf8e0b to 0fc88fb Jun 5, 2019
@twangboy twangboy merged commit d0810d7 into saltstack:2019.2.1 Jun 6, 2019
16 of 17 checks passed
16 of 17 checks passed
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
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-6 The py2-centos-6 job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-debian-8 The py2-debian-8 job has passed
Details
jenkins/pr/py2-debian-9 The py2-debian-9 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-ubuntu-1804 The py2-ubuntu-1804 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-debian-8 The py3-debian-8 job has passed
Details
jenkins/pr/py3-debian-9 The py3-debian-9 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1804 The py3-ubuntu-1804 job has passed
Details
@twangboy twangboy deleted the twangboy:fix_win_system branch Jul 2, 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.