diff mbox series

[21/23] CI: Create avocado.conf inside build_dir

Message ID 20240325155540.4162990-22-amikan@ilbers.de
State New
Headers show
Series Additional CI improvements | expand

Commit Message

Anton Mikanovich March 25, 2024, 3:55 p.m. UTC 
To be sure all outputs are located inside it.

Also do not resolve symbolic links to keep original path naming.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 scripts/ci_build.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 7e841886..cd4c8960 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -132,13 +132,13 @@  if echo "$TAGS" | grep -Fqive "-startvm"; then
 fi
 
 # Provide working path
-mkdir -p .config/avocado
-cat <<EOF > .config/avocado/avocado.conf
+mkdir -p "${BASE_DIR}"
+cat <<EOF > "${BASE_DIR}/avocado.conf"
 [datadir.paths]
-base_dir = $(realpath "${BASE_DIR}")/
-test_dir = $(realpath "${BASE_DIR}")/tests
-data_dir = $(realpath "${BASE_DIR}")/data
-logs_dir = $(realpath "${BASE_DIR}")/job-results
+base_dir = $(realpath -s "${BASE_DIR}")/
+test_dir = $(realpath -s "${BASE_DIR}")/tests
+data_dir = $(realpath -s "${BASE_DIR}")/data
+logs_dir = $(realpath -s "${BASE_DIR}")/job-results
 EOF
 export VIRTUAL_ENV="./"
 
@@ -147,6 +147,6 @@  TESTFILE=$(realpath -s --relative-to=$(pwd) "${TESTSUITE_DIR}/citest.py")
 # the real stuff starts here, trace commands from now on
 set -x
 
-avocado ${VERBOSE} run "${TESTFILE}" \
+avocado ${VERBOSE} --config "${BASE_DIR}/avocado.conf" run "${TESTFILE}" \
     -t "${TAGS}" --max-parallel-tasks=1 --disable-sysinfo \
     ${SSTATE} ${TIMEOUT}