Change in osmo-gsm-tester[master]: process: Allow passing no local inst to copy_inst_ssh

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16230 )

Change subject: process: Allow passing no local inst to copy_inst_ssh
......................................................................

process: Allow passing no local inst to copy_inst_ssh

This will be useful in the event a user wants to run a binary already
available in the target which needs no copying, but still requires the
non-binary related items to be copied and set up, such as config files,
directory structure, etc.
This option will be used to run osmo-trx-lms in LimeNetMicro already
installed from an OBS repo, since cross-compiling all related
dependencies would require a lot of work to do now.

Change-Id: I6b0f2a19e493c7ac911c5db0ea08f5c0ab936d74
---
M src/osmo_gsm_tester/process.py
1 file changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py
index ef6bca1..06da3bf 100644
--- a/src/osmo_gsm_tester/process.py
+++ b/src/osmo_gsm_tester/process.py
@@ -416,12 +416,16 @@
 def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path):
     run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path)))
 
+# If no inst binaries copying is required (eg. because binary+libs is already available in distro), inst can be None.
 def copy_inst_ssh(run_dir, inst, remote_dir, remote_user, remote_addr, remote_rundir_append, cfg_file_name):
-    remote_inst = Dir(remote_dir.child(os.path.basename(str(inst))))
     remote_dir_str = str(remote_dir)
     run_remote_sync(run_dir, remote_user, remote_addr, 'rm-remote-dir', ('test', '!', '-d', remote_dir_str, '||', 'rm', '-rf', remote_dir_str))
     run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-dir', ('mkdir', '-p', remote_dir_str))
-    scp(run_dir, remote_user, remote_addr, 'scp-inst-to-remote', str(inst), remote_dir_str)
+    if inst is not None:
+        remote_inst = Dir(remote_dir.child(os.path.basename(str(inst))))
+        scp(run_dir, remote_user, remote_addr, 'scp-inst-to-remote', str(inst), remote_dir_str)
+    else:
+        remote_inst = None
 
     remote_run_dir = remote_dir.child(remote_rundir_append)
     run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-run-dir', ('mkdir', '-p', remote_run_dir))

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16230
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I6b0f2a19e493c7ac911c5db0ea08f5c0ab936d74
Gerrit-Change-Number: 16230
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191127/c14d601f/attachment.htm>