From d4f1a510d07ceaa5561baad65b35a397c56c771a Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Tue, 26 Nov 2024 20:21:58 +0100
Subject: [PATCH] Move `prepare-board.sh` step outside of robot tests.

---
 .ci/robot_framework/run-robot.sh                 |  5 +++++
 .ci/robot_framework/tests/keywords_common.robot  |  5 -----
 .ci/robot_framework/tests/tests_000_common.robot | 12 ------------
 .ci/robot_framework/tests/variables.robot        |  2 --
 4 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 .ci/robot_framework/tests/tests_000_common.robot

diff --git a/.ci/robot_framework/run-robot.sh b/.ci/robot_framework/run-robot.sh
index 93e59ef..07aecf0 100755
--- a/.ci/robot_framework/run-robot.sh
+++ b/.ci/robot_framework/run-robot.sh
@@ -25,6 +25,11 @@ cd "tests_results/${DATE}_robot_${TESTS_RESULTS}/"
 # Copy the setup-env files.
 cp ../../setup-env*sh .
 
+if [[ "${TEST_BOARD_SETUP_SKIP}" != "yes" ]]
+then
+    ../../prepare-board.sh
+fi
+
 exec robot --name "WPE image tests" \
            --consolewidth 158 \
            --exclude skip \
diff --git a/.ci/robot_framework/tests/keywords_common.robot b/.ci/robot_framework/tests/keywords_common.robot
index b1d3ab9..4c8c3ef 100644
--- a/.ci/robot_framework/tests/keywords_common.robot
+++ b/.ci/robot_framework/tests/keywords_common.robot
@@ -27,11 +27,6 @@ Get Remote Memory Used
     ${value}=    Evaluate    float(${stdout}[0])
     RETURN    ${value}
 
-Prepare Board
-    ${rc}    ${output}=    Run And Return Rc And Output    ${PREPARE_BOARD_SCRIPT}
-    Should Be Equal As Integers    ${rc}    0    msg=Prepare Board command failed with non-zero exit status
-    Log    output: ${output}
-
 Webdriver Remote Start
     ${TEST_BOARD_IP}    Get Environment Variable    TEST_BOARD_IP
     ${TEST_BOARD_WEBDRIVER_PORT}    Get Environment Variable    TEST_BOARD_WEBDRIVER_PORT
diff --git a/.ci/robot_framework/tests/tests_000_common.robot b/.ci/robot_framework/tests/tests_000_common.robot
deleted file mode 100644
index 5da0826..0000000
--- a/.ci/robot_framework/tests/tests_000_common.robot
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Settings ***
-Test Timeout    600 seconds
-
-Resource   variables.robot
-Resource   keywords_common.robot
-
-*** Test Cases ***
-Setup
-    ${TEST_BOARD_SETUP_SKIP}    Get Environment Variable    TEST_BOARD_SETUP_SKIP    default=no
-    Run Keyword If    '${TEST_BOARD_SETUP_SKIP}' != 'yes'
-    ...    Prepare Board
-
diff --git a/.ci/robot_framework/tests/variables.robot b/.ci/robot_framework/tests/variables.robot
index 7677d47..1868898 100644
--- a/.ci/robot_framework/tests/variables.robot
+++ b/.ci/robot_framework/tests/variables.robot
@@ -1,6 +1,4 @@
 *** Variables ***
-${PREPARE_BOARD_SCRIPT}    ../../prepare-board.sh
-
 ${MOTIONMARK_MIN_SCORE}      90
 
 ${VIDEO_30_FPS_THRESHOLD_CPU_LOAD}    3