diff --git a/api/Jenkinsfile.ble_test b/api/Jenkinsfile.ble_test index 3237b0a..9a6bd52 100644 --- a/api/Jenkinsfile.ble_test +++ b/api/Jenkinsfile.ble_test @@ -63,22 +63,18 @@ pipeline { // --------------------------------------------------------------------- stage('Run BLE Test') { steps { - retry(3) { // 3× retry on transient SSH hiccups - timeout(time: 5, unit: 'MINUTES') { // 5-minute hard timeout - sshagent([env.SSH_CREDENTIALS_ID]) { - sh """ - ssh -o StrictHostKeyChecking=no root@${params.host_ip} -o ServerAliveInterval=60 -o ServerAliveCountMax=120 << EOF - usbreset ${params.BT_USB_ID} - sleep 5 - cd /opt/ble-test/ble_api - git pull - cd /opt/ble-test/ble_api/api - sleep 2 - screen -dmS ble_test_${env.TEST_HASH} bash -c "cd /opt/ble-test/ble_api/api && python3 -u ./ble.py ${params.test_count} | tee /tmp/ble_test_${env.TEST_HASH}.log" - tail -f /tmp/ble_test_${env.TEST_HASH}.log - """ - } - } + sshagent([env.SSH_CREDENTIALS_ID]) { + sh """ + ssh -o StrictHostKeyChecking=no root@${params.host_ip} -o ServerAliveInterval=60 -o ServerAliveCountMax=120 << EOF + usbreset ${params.BT_USB_ID} + sleep 5 + cd /opt/ble-test/ble_api + git pull + cd /opt/ble-test/ble_api/api + sleep 2 + screen -dmS ble_test_${env.TEST_HASH} bash -c "cd /opt/ble-test/ble_api/api && python3 -u ./ble.py ${params.test_count} | tee /tmp/ble_test_${env.TEST_HASH}.log" + tail -f /tmp/ble_test_${env.TEST_HASH}.log + """ } } }