fix jenkinsfile num error

This commit is contained in:
matt committed 2026-10-17 23:57:51 -07:00
1 parent 0fdcd65803
commit f40bba753e
1 file changed
+50 -47
+50 -47
View File
@@ -25,84 +25,87 @@ pipeline {
stages { stages {
// --------------------------------------------------------------- // ---------------------------------------------------------------
// 1️⃣ Prepare a unique screen session name // 1️⃣ Generate a unique screen session name
// --------------------------------------------------------------- // ---------------------------------------------------------------
stage('Prepare Screen Name') { stage('Prepare Screen Name') {
steps { steps {
script { script {
// epoch seconds truncated to the last 6 digits // 1) Get epoch seconds (long)
def epochSec = System.currentTimeMillis() / 1000 long epochSec = (System.currentTimeMillis() / 1000L) as long
// 2) Keep only the last 6 digits to avoid collisions
env.SCREEN_SESSION = "ble_test_${String.format('%06d', epochSec % 1_000_000)}" env.SCREEN_SESSION = "ble_test_${String.format('%06d', epochSec % 1_000_000)}"
} }
} }
} }
// --------------------------------------------------------------- // ---------------------------------------------------------------
// 2️⃣ Verify / install screen (runs only once) // 2️⃣ Ensure screen is installed (runs only once)
// --------------------------------------------------------------- // ---------------------------------------------------------------
stage('Ensure screen is present') { stage('Ensure screen is present') {
steps { steps {
sshagent([env.SSH_CREDENTIALS_ID]) { sshagent([env.SSH_CREDENTIALS_ID]) {
sh """ sh '''\
ssh -o StrictHostKeyChecking=no \\ ssh -o StrictHostKeyChecking=no \
-o ServerAliveInterval=60 \\ -o ServerAliveInterval=60 \
-o ServerAliveCountMax=120 \\ -o ServerAliveCountMax=120 \
root@${params.host_ip} <<'EOF' root@${params.host_ip} <<'EOF'
# If screen is missing, install it if ! command -v screen > /dev/null; then
if ! command -v screen > /dev/null; then
echo "screen not found – installing" echo "screen not found – installing"
apt-get update && apt-get install -y screen apt-get update && apt-get install -y screen
fi fi
EOF EOF
""" '''
} }
} }
} }
// --------------------------------------------------------------- // ---------------------------------------------------------------
// 3️⃣ Run the BLE test in a detached screen session // 3️⃣ Run the BLE test inside a detached screen session
// --------------------------------------------------------------- // ---------------------------------------------------------------
stage('Run BLE Test') { stage('Run BLE Test') {
steps { steps {
retry(3) { retry(3) { // 3× retry on transient SSH hiccups
timeout(time: 8, unit: 'HOURS') { timeout(time: 8, unit: 'HOURS') { // 8‑hour hard timeout
sshagent([env.SSH_CREDENTIALS_ID]) { sshagent([env.SSH_CREDENTIALS_ID]) {
sh """ sh '''\
ssh -o StrictHostKeyChecking=no \\ ssh -o StrictHostKeyChecking=no \
-o ServerAliveInterval=60 \\ -o ServerAliveInterval=60 \
-o ServerAliveCountMax=120 \\ -o ServerAliveCountMax=120 \
root@${params.host_ip} <<'EOF' root@${params.host_ip} <<'EOF'
# Start the test in a detached screen session # Start test in detached screen
screen -dmS ${env.SCREEN_SESSION} bash -c ' screen -dmS ${env.SCREEN_SESSION} bash -c '
echo "===== BLE test starting: \$(date)" > /tmp/ble_test.log echo "===== BLE test starting: $(date)" > /tmp/ble_test.log
usbreset ${params.BT_USB_ID} usbreset ${params.BT_USB_ID}
sleep 5 sleep 5
cd /opt/ble-test/ble_api cd /opt/ble-test/ble_api
git pull git pull
cd /opt/ble-test/ble_api/api cd /opt/ble-test/ble_api/api
python3 -u ${REMOTE_SCRIPT} ${params.test_count} 2>&1 | tee -a /tmp/ble_test.log python3 -u ${REMOTE_SCRIPT} ${params.test_count} 2>&1 | tee -a /tmp/ble_test.log
echo "===== BLE test finished: \$(date)" >> /tmp/ble_test.log echo "===== BLE test finished: $(date)" >> /tmp/ble_test.log
' '
# Give screen a moment to spin up # Give screen a moment to spin up
sleep 2 sleep 2
EOF EOF
""" '''
} }
// Verify that the test finished // ------------------------------------------------------------------
sh """ // 3a. Verify that the test finished successfully
ssh -o StrictHostKeyChecking=no \\ // ------------------------------------------------------------------
-o ServerAliveInterval=60 \\ sh '''\
-o ServerAliveCountMax=120 \\ ssh -o StrictHostKeyChecking=no \
-o ServerAliveInterval=60 \
-o ServerAliveCountMax=120 \
root@${params.host_ip} <<'EOF' root@${params.host_ip} <<'EOF'
if grep -q "BLE test finished" /tmp/ble_test.log; then if grep -q "BLE test finished" /tmp/ble_test.log; then
echo "Test completed successfully." echo "Test completed successfully."
else else
echo "Test did NOT finish – aborting build." echo "Test did NOT finish – aborting build."
exit 1 exit 1
fi fi
EOF EOF
""" '''
} }
} }
} }
@@ -115,16 +118,16 @@ pipeline {
post { post {
always { always {
sshagent([env.SSH_CREDENTIALS_ID]) { sshagent([env.SSH_CREDENTIALS_ID]) {
sh """ sh '''\
ssh -o StrictHostKeyChecking=no \\ ssh -o StrictHostKeyChecking=no \
-o ServerAliveInterval=60 \\ -o ServerAliveInterval=60 \
-o ServerAliveCountMax=120 \\ -o ServerAliveCountMax=120 \
root@${params.host_ip} <<'EOF' root@${params.host_ip} <<'EOF'
if screen -list | grep -q ${env.SCREEN_SESSION}; then if screen -list | grep -q ${env.SCREEN_SESSION}; then
screen -S ${env.SCREEN_SESSION} -X quit screen -S ${env.SCREEN_SESSION} -X quit
fi fi
EOF EOF
""" '''
} }
} }
} }