[S] Change in osmo-ci[master]: scripts/repo-install-test: fix sftp compat, part 2

2023-10-23 Thread osmith 
osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34856?usp=email )

Change subject: scripts/repo-install-test: fix sftp compat, part 2
..

scripts/repo-install-test: fix sftp compat, part 2

Copy files inside repo-install-test, instead of copying the directory
again. Otherwise it creates a /repo-install-test/repo-install-test/ path
inside qemu and then fails to run the script inside the directory:

Fix for:
  sh: 0: cannot open /repo-install-test/run-inside-env.sh: No such file

Fixes: a7791217 ("scripts/repo-install-test: fix sftp compat")
Change-Id: I04d8c0e0fd31ee5d2a0912300dc93f5339bbef11
---
M scripts/repo-install-test.sh
1 file changed, 18 insertions(+), 1 deletion(-)

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




diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index 98f0176..7bef5bf 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -154,7 +154,7 @@

qemu_ssh rm -rf /repo-install-test/
qemu_ssh mkdir /repo-install-test
-   qemu_scp -r "$TEST_DIR" "root@127.0.0.1:/repo-install-test"
+   qemu_scp -r "$TEST_DIR"/* "root@127.0.0.1:/repo-install-test"

TIMEOUT="1h" qemu_ssh sh -ex /repo-install-test/run-inside-env.sh
 }

--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34856?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I04d8c0e0fd31ee5d2a0912300dc93f5339bbef11
Gerrit-Change-Number: 34856
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-ci[master]: scripts/repo-install-test: fix sftp compat, part 2

2023-10-23 Thread pespin 
Attention is currently required from: fixeria, osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34856?usp=email )

Change subject: scripts/repo-install-test: fix sftp compat, part 2
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34856?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I04d8c0e0fd31ee5d2a0912300dc93f5339bbef11
Gerrit-Change-Number: 34856
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Mon, 23 Oct 2023 11:23:42 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: scripts/repo-install-test: fix sftp compat, part 2

2023-10-23 Thread osmith 
osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34856?usp=email )


Change subject: scripts/repo-install-test: fix sftp compat, part 2
..

scripts/repo-install-test: fix sftp compat, part 2

Copy files inside repo-install-test, instead of copying the directory
again. Otherwise it creates a /repo-install-test/repo-install-test/ path
inside qemu and then fails to run the script inside the directory:

Fix for:
  sh: 0: cannot open /repo-install-test/run-inside-env.sh: No such file

Fixes: a7791217 ("scripts/repo-install-test: fix sftp compat")
Change-Id: I04d8c0e0fd31ee5d2a0912300dc93f5339bbef11
---
M scripts/repo-install-test.sh
1 file changed, 18 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/34856/1

diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index 98f0176..7bef5bf 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -154,7 +154,7 @@

qemu_ssh rm -rf /repo-install-test/
qemu_ssh mkdir /repo-install-test
-   qemu_scp -r "$TEST_DIR" "root@127.0.0.1:/repo-install-test"
+   qemu_scp -r "$TEST_DIR"/* "root@127.0.0.1:/repo-install-test"

TIMEOUT="1h" qemu_ssh sh -ex /repo-install-test/run-inside-env.sh
 }

--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34856?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I04d8c0e0fd31ee5d2a0912300dc93f5339bbef11
Gerrit-Change-Number: 34856
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange