openembedded-core.lists.openembedded.org archive mirror
 help / color / mirror / Atom feed
From: "Alexis Lothoré" <alexis.lothore@bootlin.com>
To: <Openembedded-core@lists.openembedded.org>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [OE-Core][RFC][PATCH 1/3] oeqa/target/ssh: update options for SCP
Date: Fri,  2 Jun 2023 11:50:35 +0200	[thread overview]
Message-ID: <20230602095037.97981-2-alexis.lothore@bootlin.com> (raw)
In-Reply-To: <20230602095037.97981-1-alexis.lothore@bootlin.com>

Add two options for SCP:
- by default scp expects sftp server to be available on target, which is
  not always true (e.g: core-image-minimal image). Pass -O to force SCP to
  fallback to legacy SCP protocol
- by default scp expects files. Passing -r option allows to copy
  directories too

Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
---
 meta/lib/oeqa/core/target/ssh.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 51079075b5bd..dc17ceecd74d 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -40,8 +40,12 @@ class OESSHTarget(OETarget):
                 '-o', 'StrictHostKeyChecking=no',
                 '-o', 'LogLevel=ERROR'
                 ]
+        scp_options = [
+                '-O', # Allow legacy option for images not containing SFTP server
+                '-r'
+        ]
         self.ssh = ['ssh', '-l', self.user ] + ssh_options
-        self.scp = ['scp'] + ssh_options
+        self.scp = ['scp'] + ssh_options + scp_options
         if port:
             self.ssh = self.ssh + [ '-p', port ]
             self.scp = self.scp + [ '-P', port ]
-- 
2.40.1



  reply	other threads:[~2023-06-02  9:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-02  9:50 [OE-Core][RFC][PATCH 0/3] add failed test artifacts retriever Alexis Lothoré
2023-06-02  9:50 ` Alexis Lothoré [this message]
2023-06-02 12:02   ` [OE-Core][RFC][PATCH 1/3] oeqa/target/ssh: update options for SCP Richard Purdie
2023-06-02 13:41     ` Alexis Lothoré
2023-06-02 13:43       ` Richard Purdie
2023-06-02  9:50 ` [OE-Core][RFC][PATCH 2/3] testimage: shut down DUT later Alexis Lothoré
2023-06-02 11:55   ` Richard Purdie
2023-06-02 12:39     ` Alexis Lothoré
2023-06-02  9:50 ` [OE-Core][RFC][PATCH 3/3] testimage: implement test artifacts retriever for failing tests Alexis Lothoré
2023-06-02 11:46   ` Alexander Kanavin
2023-06-02 11:52     ` Mikko Rapeli
2023-06-02 12:15       ` Alexis Lothoré
2023-06-02 12:21         ` Alexander Kanavin
2023-06-02 13:07         ` Mikko Rapeli
2023-06-07  7:36           ` Alexis Lothoré
2023-06-07  7:46             ` Mikko Rapeli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230602095037.97981-2-alexis.lothore@bootlin.com \
    --to=alexis.lothore@bootlin.com \
    --cc=Openembedded-core@lists.openembedded.org \
    --cc=alexandre.belloni@bootlin.com \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).