commit 649fbe3938e0fc800df3dfd734dea3d6f76c969c
author Milosz Wasilewski <milosz.wasilewski@oss.qualcomm.com> Fri Jan 10 10:49:38 2025 +0000
committer Anders Roxell <anders.roxell@gmail.com> Thu Jan 16 09:21:34 2025 +0100
tree ba6992ebbb1ead4b7539c54b23dbc58f2c35f0d5
parent b52bb271bb5917e95a6937daafd9ffcf8dceb7e3

automated: linux: update bootrr definition

bootrr official upstream repository moved to
https://github.com/linux-msm/bootrr. On top of that bootrr now executes
tests based on the DTB. It is still possible to overwrite the detected
DTB but it's not a recommended way of running the test. On the systems
without package manager the bootrr package should be preinstalled before
running the test.

Signed-off-by: Milosz Wasilewski <milosz.wasilewski@oss.qualcomm.com>

automated/linux/bootrr/bootrr.sh

diff --git a/automated/linux/bootrr/bootrr.sh b/automated/linux/bootrr/bootrr.sh
new file mode 100755
index 0000000..bd03093
--- /dev/null
+++ b/automated/linux/bootrr/bootrr.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2025 Qualcomm Inc.
+
+# shellcheck disable=SC1091
+. ../../lib/sh-test-lib
+BOARD=""
+REPOSITORY="https://github.com/linux-msm/bootrr"
+SKIP_INSTALL="true"
+
+usage() {
+    echo "Usage: $0 [-b <board>] [-r <bootrr repository url>] [-s <true|false>]" 1>&2
+    exit 1
+}
+
+while getopts "b:r:s:" o; do
+  case "$o" in
+    b) BOARD="${OPTARG}" ;;
+    r) REPOSITORY="${OPTARG}" ;;
+    s) SKIP_INSTALL="${OPTARG}" ;;
+    *) usage ;;
+  esac
+done
+
+install() {
+    install_deps git "${SKIP_INSTALL}"
+    git clone "${REPOSITORY}" bootrr
+    cd bootrr || error_msg "bootrr cloning failed"
+    make DESTDIR=/ install
+}
+
+! check_root && error_msg "This script must be run as root"
+
+if [ "${SKIP_INSTALL}" = "false" ] ||  [ "${SKIP_INSTALL}" = "False" ] || [ "${SKIP_INSTALL}" = "FALSE" ]; then
+    install
+fi
+
+if [ -z "${BOARD}" ]; then
+    # bootrr tests are executed based on DTB
+    bootrr
+else
+    # run tests for board that might not be compatible
+    BOOTRR_DIR="/usr/libexec/bootrr"
+    PATH="${BOOTRR_DIR}/helpers:${PATH}"
+    if [ -x "${BOOTRR_DIR}/boards/${BOARD}" ]; then
+        ${BOOTRR_DIR}/boards/"${BOARD}"
+    fi
+fi

automated/linux/bootrr/bootrr.yaml

diff --git a/automated/linux/bootrr/bootrr.yaml b/automated/linux/bootrr/bootrr.yaml
index 084a0e3..c019955 100644
--- a/automated/linux/bootrr/bootrr.yaml
+++ b/automated/linux/bootrr/bootrr.yaml
@@ -1,9 +1,9 @@
 metadata:
     format: Lava-Test Test Definition 1.0
     name: bootrr
-    description: "Run bootrr https://github.com/andersson/bootrr"
+    description: "Run bootrr https://github.com/linux-msm/bootrr"
     maintainer:
-        - milosz.wasilewski@linaro.org
+        - milosz.wasilewski@oss.qualcomm.com
         - chase.qi@linaro.org
     os:
         - debian
@@ -17,17 +17,16 @@
         - apq8016-sbc
         - dragonboard-410c
         - dragonboard-820c
+        - qcs6490-rb3gen2
 
 params:
-    # Refer to https://github.com/andersson/bootrr/tree/master/boards for boards supported.
-    BOARD: "arrow,apq8096-db820c"
-    SKIP_INSTALL: false
+    # Refer to https://github.com/linux-msm/bootrr/tree/master/boards for boards supported.
+    BOARD: ""
+    REPOSITORY: "https://github.com/linux-msm/bootrr"
+    SKIP_INSTALL: true
 
 run:
     steps:
-        - . ./automated/lib/sh-test-lib
-        - install_deps git "${SKIP_INSTALL}"
-        - git clone https://github.com/andersson/bootrr
-        - cd bootrr
-        - export PATH=$PWD/helpers:$PATH
-        - ./boards/${BOARD}
+        - cd automated/linux/bootrr
+        # bootrr produces LAVA friendly output
+        - ./bootrr.sh -r "${REPOSITORY}" -s "S{SKIP_INSTALL}" -b "${BOARD}"