Skip to content

Commit 41d8395

Browse files
jenkins: don't rely on SSH params (#23924)
* jenkins: don't rely on SSH param * better ssh enabling * fix path * fix that
1 parent 6ff643c commit 41d8395

File tree

1 file changed

+31
-12
lines changed

1 file changed

+31
-12
lines changed

selfdrive/test/setup_device_ci.sh

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,47 @@ fi
2020
umount /data/safe_staging/merged/ || true
2121
sudo umount /data/safe_staging/merged/ || true
2222

23+
export KEYS_PARAM_PATH="/data/params/d/GithubSshKeys"
2324
if [ -f "/EON" ]; then
25+
export KEYS_PATH="/data/data/com.termux/files/home/setup_keys"
26+
export CONTINUE_PATH="/data/data/com.termux/files/continue.sh"
27+
28+
if ! grep -F "$KEYS_PATH" /usr/etc/ssh/sshd_config; then
29+
echo "setting up keys"
30+
mount -o rw,remount /system
31+
sed -i "s,$KEYS_PARAM_PATH,$KEYS_PATH," /usr/etc/ssh/sshd_config
32+
mount -o ro,remount /system
33+
fi
34+
35+
# these can get pretty big
2436
rm -rf /data/core
2537
rm -rf /data/neoupdate
2638
rm -rf /data/safe_staging
27-
fi
39+
else
40+
export KEYS_PATH="/usr/comma/setup_keys"
41+
export CONTINUE_PATH="/data/continue.sh"
2842

29-
export KEYS_PATH="/usr/comma/setup_keys"
30-
export CONTINUE_PATH="/data/continue.sh"
31-
if [ -f "/EON" ]; then
32-
export KEYS_PATH="/data/data/com.termux/files/home/setup_keys"
33-
export CONTINUE_PATH="/data/data/com.termux/files/continue.sh"
43+
if ! grep -F "$KEYS_PATH" /etc/ssh/sshd_config; then
44+
echo "setting up keys"
45+
sudo mount -o rw,remount /
46+
sudo systemctl enable ssh
47+
sudo sed -i "s,$KEYS_PARAM_PATH,$KEYS_PATH," /etc/ssh/sshd_config
48+
sudo mount -o ro,remount /
49+
fi
3450
fi
51+
3552
tee $CONTINUE_PATH << EOF
3653
#!/usr/bin/bash
3754
38-
PARAMS_ROOT="/data/params/d"
39-
4055
while true; do
41-
mkdir -p \$PARAMS_ROOT
42-
cp $KEYS_PATH \$PARAMS_ROOT/GithubSshKeys
43-
echo -n 1 > \$PARAMS_ROOT/SshEnabled
44-
sleep 1m
56+
if [ -f /EON ]; then
57+
setprop persist.neos.ssh 1
58+
else
59+
if ! sudo systemctl is-active -q ssh; then
60+
sudo systemctl start ssh
61+
fi
62+
fi
63+
sleep 10s
4564
done
4665
4766
sleep infinity

0 commit comments

Comments
 (0)