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 ssh on Windows (2018.3.4) #51544

Merged
merged 1 commit into from Feb 7, 2019

Conversation

@twangboy
Copy link
Contributor

commented Feb 7, 2019

What does this PR do?

Windows Server 2019 now includes OpenSSH by default. The tests now run on Windows Server 2019 because it's finding the ssh binary. The ssh module was gated for Windows.

This PR changes the gate to ssh binary presence and allows the ssh module to load on Windows if the binary is present. There are a few calls to os.geteuid which does not exist on Windows either, so these are gated.

What issues does this PR fix or reference?

https://jenkinsci.saltstack.com/job/2018.3.4/job/salt-windows-2019-py2/1/

Tests written?

Yes

Commits signed with GPG?

Yes

@dwoz
dwoz approved these changes Feb 7, 2019
@twangboy twangboy added the 2018.3.4 label Feb 7, 2019
@Ch3LL
Ch3LL approved these changes Feb 7, 2019
@Ch3LL Ch3LL merged commit 564a65a into saltstack:2018.3.4 Feb 7, 2019
8 of 10 checks passed
8 of 10 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
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
@twangboy twangboy deleted the twangboy:fix_test_ssh_2018.3.4 branch Feb 8, 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.