diff --git a/Jenkinsfile b/Jenkinsfile index 44c732cdf5..1d9a71faea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ def phone(String ip, String step_label, String cmd) { - withCredentials([file(credentialsId: 'id_rsa_public', variable: 'key_file')]) { + withCredentials([file(credentialsId: 'id_rsa', variable: 'key_file')]) { def ssh_cmd = """ ssh -tt -o StrictHostKeyChecking=no -i ${key_file} -p 8022 'comma@${ip}' /usr/bin/bash <<'EOF' diff --git a/selfdrive/test/setup_device_ci.sh b/selfdrive/test/setup_device_ci.sh index b605a8e8c8..435a6af436 100755 --- a/selfdrive/test/setup_device_ci.sh +++ b/selfdrive/test/setup_device_ci.sh @@ -12,8 +12,18 @@ if [ -z "$TEST_DIR" ]; then exit 1 fi +# setup jenkins device if [ ! -d "$SOURCE_DIR" ]; then - git clone https://github.com/commaai/openpilot.git "$SOURCE_DIR" + # write continue.sh + CONTINUE_FILE="/data/data/com.termux/files/continue.sh" + echo "#!/usr/bin/bash" > $CONTINUE_FILE + echo "wpa_cli IFNAME=wlan0 SCAN" >> $CONTINUE_FILE + echo "sleep infinity" >> $CONTINUE_FILE + + # write SSH keys + curl "https://github.com/commaci2.keys" > /data/params/d/GithubSshKeys + + git clone --depth 1 https://github.com/commaai/openpilot.git "$SOURCE_DIR" fi # clear scons cache dirs that haven't been written to in one day