sshdriver: support selecting scp mode explicitly #1281
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #1281 +/- ##
========================================
- Coverage 63.0% 63.0% -0.1%
========================================
Files 160 160
Lines 11865 11902 +37
========================================
+ Hits 7480 7501 +21
- Misses 4385 4401 +16
☔ View full report in Codecov by Sentry. |
7 tasks
jluebbe
reviewed
Oct 12, 2023
Signed-off-by: Enrico Jorns <[email protected]>
We will use the version multiple times and should not call ssh each time since we do not expect the ssh version to suddenly change while running labgrid. Signed-off-by: Enrico Jorns <[email protected]>
|
Changes since initial submission:
|
jluebbe
approved these changes
Oct 13, 2023
Bastian-Krause
approved these changes
Oct 13, 2023
OpenSSH >= 9.0 defaults to the SFTP protocol. However, some older targets may only have scp installed. OpenSSH allows to explicitly select scp by providing the -O flag. As already done for the transition of SFTP, add a dedicated SSHDriver attribute named 'explicit_scp_mode' which defaults to 'False'. Signed-off-by: Enrico Jorns <[email protected]>
Bastian-Krause
force-pushed
the
explicit-scp
branch
from
f3236a0
to
fbd0c8b
Compare
jluebbe
approved these changes
Oct 13, 2023
Bastian-Krause
approved these changes
Oct 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
OpenSSH >= 9.0 defaults to the SFTP protocol. However, some older targets may only have scp installed. OpenSSH allows to explicitly select scp by providing the
-Oflag.As already done for the transition of SFTP, add a dedicated SSHDriver attribute named
explicit_scp_modewhich defaults toFalse.To not call the OpenSSH version check too often, move the call to a
@cached_property.Checklist
Fixes what was addressed in a comment for #1003