ci: cram: use legacy SCP protocol for remote copies
OpenSSH in the Debian 13 testbed container uses SFTP for scp transfers
by default, while the DUT images do not provide an SFTP server.
Force the legacy SCP protocol in the shared cram copy command, the
security certificate fixture, and the remaining direct scp calls so
every test can stage its helper files and packages.
Assisted-by: codex:gpt-5
Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>
Fixes: 854ef0eafb ("ci: cram: add new LCM tests")
References: PPW-1258
This commit is contained in:
parent
f414d6aed2
commit
5fd42aa540
@ -204,9 +204,9 @@
|
|||||||
ssh root@$TARGET_LAN_IP "cat /var/log/messages" > syslog-$LABGRID_TARGET.txt
|
ssh root@$TARGET_LAN_IP "cat /var/log/messages" > syslog-$LABGRID_TARGET.txt
|
||||||
ssh root@$TARGET_LAN_IP opkg list > opkg_list-$LABGRID_TARGET.txt
|
ssh root@$TARGET_LAN_IP opkg list > opkg_list-$LABGRID_TARGET.txt
|
||||||
script --quiet --command "ssh -t root@$TARGET_LAN_IP /bin/getDebugInformation --all"
|
script --quiet --command "ssh -t root@$TARGET_LAN_IP /bin/getDebugInformation --all"
|
||||||
scp -r root@${TARGET_LAN_IP}:/tmp/debug-*_all.tar.gz . > /dev/null
|
scp -O -r root@${TARGET_LAN_IP}:/tmp/debug-*_all.tar.gz . > /dev/null
|
||||||
scp -r root@${TARGET_LAN_IP}:/etc etc > /dev/null
|
scp -O -r root@${TARGET_LAN_IP}:/etc etc > /dev/null
|
||||||
scp -r root@${TARGET_LAN_IP}:/tmp/beerocks/logs prplmesh_beerocks_logs > /dev/null
|
scp -O -r root@${TARGET_LAN_IP}:/tmp/beerocks/logs prplmesh_beerocks_logs > /dev/null
|
||||||
} || true
|
} || true
|
||||||
|
|
||||||
- .gitlab/scripts/testbed-device.py --target $LABGRID_TARGET power off
|
- .gitlab/scripts/testbed-device.py --target $LABGRID_TARGET power off
|
||||||
|
|||||||
@ -83,7 +83,7 @@ configure_usp_reset_file() {
|
|||||||
ssh "root@$TARGET_LAN_IP" "service obuspa stop"
|
ssh "root@$TARGET_LAN_IP" "service obuspa stop"
|
||||||
|
|
||||||
log_info "Installing ${protocol_name} OBUSPA reset file"
|
log_info "Installing ${protocol_name} OBUSPA reset file"
|
||||||
scp "$reset_file" "root@${TARGET_LAN_IP}:${remote_reset_file}"
|
scp -O "$reset_file" "root@${TARGET_LAN_IP}:${remote_reset_file}"
|
||||||
|
|
||||||
log_info "Removing stale OBUSPA database"
|
log_info "Removing stale OBUSPA database"
|
||||||
ssh "root@$TARGET_LAN_IP" "rm -f /etc/obuspa.db"
|
ssh "root@$TARGET_LAN_IP" "rm -f /etc/obuspa.db"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
scp .gitlab/mockups/tr181-mockups.tar.gz root@${TARGET_LAN_IP}:/tmp/
|
scp -O .gitlab/mockups/tr181-mockups.tar.gz root@${TARGET_LAN_IP}:/tmp/
|
||||||
ssh root@$TARGET_LAN_IP "tar xzf /tmp/tr181-mockups.tar.gz -C / && /etc/init.d/tr181-mockups start"
|
ssh root@$TARGET_LAN_IP "tar xzf /tmp/tr181-mockups.tar.gz -C / && /etc/init.d/tr181-mockups start"
|
||||||
ssh root@$TARGET_LAN_IP "ubus call ProxyManager register '{\"proxy\":\"Device.LANConfigSecurity.\", \"real\":\"LANConfigSecurity.\" } '"
|
ssh root@$TARGET_LAN_IP "ubus call ProxyManager register '{\"proxy\":\"Device.LANConfigSecurity.\", \"real\":\"LANConfigSecurity.\" } '"
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
DUT_OBUSPA_VERBOSE_LEVEL: ''
|
DUT_OBUSPA_VERBOSE_LEVEL: ''
|
||||||
DUT_OBUSPA_PROTOCOL_TRACE: ''
|
DUT_OBUSPA_PROTOCOL_TRACE: ''
|
||||||
TEST_SETUP_TEARDOWN_DURATION: 360
|
TEST_SETUP_TEARDOWN_DURATION: 360
|
||||||
CRAM_REMOTE_COMMAND: ssh -n root@$TARGET_LAN_IP
|
CRAM_REMOTE_COMMAND: ssh root@$TARGET_LAN_IP
|
||||||
CRAM_REMOTE_COPY: scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
|
CRAM_REMOTE_COPY: scp -O -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
|
||||||
CRAM_TEST_SUITE: |
|
CRAM_TEST_SUITE: |
|
||||||
.gitlab/tests/cram/generic/acceleration-plan-components
|
.gitlab/tests/cram/generic/acceleration-plan-components
|
||||||
.gitlab/tests/cram/$DUT_BOARD/acceleration-plan-components
|
.gitlab/tests/cram/$DUT_BOARD/acceleration-plan-components
|
||||||
@ -189,9 +189,9 @@
|
|||||||
ssh root@$TARGET_LAN_IP "cat /var/log/messages" > syslog-$LABGRID_TARGET.txt
|
ssh root@$TARGET_LAN_IP "cat /var/log/messages" > syslog-$LABGRID_TARGET.txt
|
||||||
ssh root@$TARGET_LAN_IP opkg list > opkg_list-$LABGRID_TARGET.txt
|
ssh root@$TARGET_LAN_IP opkg list > opkg_list-$LABGRID_TARGET.txt
|
||||||
script --quiet --command "ssh -t root@$TARGET_LAN_IP /bin/getDebugInformation --all"
|
script --quiet --command "ssh -t root@$TARGET_LAN_IP /bin/getDebugInformation --all"
|
||||||
scp -r root@${TARGET_LAN_IP}:/tmp/debug-*_all.tar.gz . > /dev/null
|
scp -O -r root@${TARGET_LAN_IP}:/tmp/debug-*_all.tar.gz . > /dev/null
|
||||||
scp -r root@${TARGET_LAN_IP}:/etc etc > /dev/null
|
scp -O -r root@${TARGET_LAN_IP}:/etc etc > /dev/null
|
||||||
scp -r root@${TARGET_LAN_IP}:/tmp/beerocks/logs prplmesh_beerocks_logs > /dev/null
|
scp -O -r root@${TARGET_LAN_IP}:/tmp/beerocks/logs prplmesh_beerocks_logs > /dev/null
|
||||||
} || true
|
} || true
|
||||||
|
|
||||||
- .gitlab/scripts/testbed-device.py --target $LABGRID_TARGET power off
|
- .gitlab/scripts/testbed-device.py --target $LABGRID_TARGET power off
|
||||||
|
|||||||
@ -18,7 +18,7 @@ Copy over testing certificates:
|
|||||||
|
|
||||||
$ R "mkdir -p /etc/amx/tr181-security/defaults.d"
|
$ R "mkdir -p /etc/amx/tr181-security/defaults.d"
|
||||||
$ R "mkdir -p /etc/config/autocert"
|
$ R "mkdir -p /etc/config/autocert"
|
||||||
$ C ${CI_PROJECT_DIR}/.gitlab/certs/tr181-security/autocert/* "root@${TARGET_LAN_IP}:/etc/config/autocert/"
|
$ C -O ${CI_PROJECT_DIR}/.gitlab/certs/tr181-security/autocert/* "root@${TARGET_LAN_IP}:/etc/config/autocert/"
|
||||||
Warning: Permanently added '*' (*) to the list of known hosts* (glob)
|
Warning: Permanently added '*' (*) to the list of known hosts* (glob)
|
||||||
|
|
||||||
Restart tr181-security service:
|
Restart tr181-security service:
|
||||||
|
|||||||
@ -4,7 +4,7 @@ Create R alias:
|
|||||||
|
|
||||||
Add testing service:
|
Add testing service:
|
||||||
|
|
||||||
$ scp -r $TESTDIR/035-multisettings/* root@${TARGET_LAN_IP}:/
|
$ scp -O -r $TESTDIR/035-multisettings/* root@${TARGET_LAN_IP}:/
|
||||||
|
|
||||||
Restart multisettings service and start testing service:
|
Restart multisettings service and start testing service:
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@ Skip test on urx851-b0-dk-pon as it has real PON and thus mocking is not needed:
|
|||||||
|
|
||||||
Install mod-xpon-prpl-mock package:
|
Install mod-xpon-prpl-mock package:
|
||||||
|
|
||||||
$ scp ${CI_PROJECT_DIR}/${DUT_ARCH_PACKAGES_PATH}/feed_prplos/mod-xpon-prpl-mock*.ipk "root@${TARGET_LAN_IP}:/tmp/"
|
$ scp -O ${CI_PROJECT_DIR}/${DUT_ARCH_PACKAGES_PATH}/feed_prplos/mod-xpon-prpl-mock*.ipk "root@${TARGET_LAN_IP}:/tmp/"
|
||||||
$ R "opkg install --force-reinstall /tmp/mod-xpon-prpl-mock*.ipk"
|
$ R "opkg install --force-reinstall /tmp/mod-xpon-prpl-mock*.ipk"
|
||||||
No packages removed.
|
No packages removed.
|
||||||
Installing mod-xpon-prpl-mock .* to root... (re)
|
Installing mod-xpon-prpl-mock .* to root... (re)
|
||||||
|
|||||||
@ -2,8 +2,8 @@ Setup the test configuration:
|
|||||||
|
|
||||||
$ alias R="${CRAM_REMOTE_COMMAND:-}"
|
$ alias R="${CRAM_REMOTE_COMMAND:-}"
|
||||||
$ S=". /tmp/script_functions.sh"
|
$ S=". /tmp/script_functions.sh"
|
||||||
$ scp ${TESTDIR}/../lcm/script_functions.sh root@${TARGET_LAN_IP}:/tmp/script_functions.sh
|
$ scp -O ${TESTDIR}/../lcm/script_functions.sh root@${TARGET_LAN_IP}:/tmp/script_functions.sh
|
||||||
$ scp ${CI_PROJECT_DIR}/${DUT_ARCH_PACKAGES_PATH}/feed_prplos/data-model-mapper*.ipk "root@${TARGET_LAN_IP}:/tmp/"
|
$ scp -O ${CI_PROJECT_DIR}/${DUT_ARCH_PACKAGES_PATH}/feed_prplos/data-model-mapper*.ipk "root@${TARGET_LAN_IP}:/tmp/"
|
||||||
$ R "opkg install -V0 --force-reinstall /tmp/data-model-mapper*.ipk;echo $?"
|
$ R "opkg install -V0 --force-reinstall /tmp/data-model-mapper*.ipk;echo $?"
|
||||||
0
|
0
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user