From dfad4af7a518016ec873aa59e2c908cef2e39638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 21 Feb 2026 09:14:00 +0100 Subject: [PATCH] ci: testbed: remove dead UART relay SSH setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the testbed-01 before_script and after_script sections contain an SSH key setup block that runs ssh-keyscan against $TESTBED_UART_RELAY_HOST (uart-relay.testbed.vpn.true.cz). This host was used by the old SSH-based ExternalPowerDriver for UART relay access, but it was replaced by Modbus/TCP in commit 69cb220a0. The host is now unreachable, so ssh-keyscan exits non-zero and set -e aborts the job, breaking all testbed-01 pipelines. So lets fix this by removing the dead SSH key setup blocks from both testbed.yml and cdrouter.yml (before_script and after_script), as well as the TESTBED_UART_RELAY_HOST variable definition. The ssh-keyscan $TARGET_LAN_IP lines for DUT SSH access are left untouched as they serve a different purpose. References: PCF-2361 Fixes: 69cb220a0007 ("ci: testbed-01: labgrid: hook in new Papouch Quido relay board") Signed-off-by: Petr Štetiar --- .gitlab/cdrouter.yml | 14 -------------- .gitlab/testbed.yml | 16 ---------------- 2 files changed, 30 deletions(-) diff --git a/.gitlab/cdrouter.yml b/.gitlab/cdrouter.yml index 055077ec0b..3c823f72e3 100644 --- a/.gitlab/cdrouter.yml +++ b/.gitlab/cdrouter.yml @@ -34,13 +34,6 @@ - sleep 10 - mkdir -p ~/.ssh; chmod 700 ~/.ssh - - > - if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-01; then - eval $(ssh-agent -s) - echo "$TESTBED_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - ssh-keyscan $TESTBED_UART_RELAY_HOST > ~/.ssh/known_hosts 2> /dev/null - chmod 644 ~/.ssh/known_hosts - fi - | echo "Using firmware image $TFTP_IMAGE_PATH/$TFTP_IMAGE_FILENAME" @@ -164,13 +157,6 @@ .gitlab/scripts/cdrouter-pretty-failures.awk cdrouter-results/*.txt - mkdir -p ~/.ssh; chmod 700 ~/.ssh - - > - if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-01; then - eval $(ssh-agent -s) - echo "$TESTBED_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - ssh-keyscan $TESTBED_UART_RELAY_HOST > ~/.ssh/known_hosts 2> /dev/null - chmod 644 ~/.ssh/known_hosts - fi - > if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-02; then diff --git a/.gitlab/testbed.yml b/.gitlab/testbed.yml index cfa4e65adc..63e6da6748 100644 --- a/.gitlab/testbed.yml +++ b/.gitlab/testbed.yml @@ -62,13 +62,6 @@ - sudo apt-get update && sudo apt-get install --yes --no-install-recommends minidlna avahi-daemon avahi-utils dbus - mkdir -p ~/.ssh; chmod 700 ~/.ssh - - > - if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-01; then - eval $(ssh-agent -s) - echo "$TESTBED_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - ssh-keyscan $TESTBED_UART_RELAY_HOST > ~/.ssh/known_hosts 2> /dev/null - chmod 644 ~/.ssh/known_hosts - fi - | echo "Using firmware image $TFTP_IMAGE_PATH/$TFTP_IMAGE_FILENAME" @@ -169,13 +162,6 @@ } - mkdir -p ~/.ssh; chmod 700 ~/.ssh - - > - if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-01; then - eval $(ssh-agent -s) - echo "$TESTBED_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - ssh-keyscan $TESTBED_UART_RELAY_HOST > ~/.ssh/known_hosts 2> /dev/null - chmod 644 ~/.ssh/known_hosts - fi - > if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-02; then @@ -231,5 +217,3 @@ .testbed true.cz: extends: .testbed - variables: - TESTBED_UART_RELAY_HOST: uart-relay.testbed.vpn.true.cz