From 9b6d14aed1df46c31b9debd9b7c346b4dcb76662 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 21 Aug 2024 11:56:33 +0100 Subject: [PATCH] ci: Always create results dir from init During init-stage2 (used for hardware jobs) and setup-test-env (used for running directly on shared runners), make sure we always create a results directory. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci/common/init-stage2.sh | 2 +- .gitlab-ci/setup-test-env.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index 3d7465c51d0..9c207ced8c8 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -206,7 +206,7 @@ EXIT_CODE=$? set -e # Let's make sure the results are always stored in current working directory -mv -f ${CI_PROJECT_DIR}/results ./ 2>/dev/null || true +mv -f ${RESULTS_DIR} ./ 2>/dev/null || true [ ${EXIT_CODE} -ne 0 ] || rm -rf results/trace/"$PIGLIT_REPLAY_DEVICE_NAME" diff --git a/.gitlab-ci/setup-test-env.sh b/.gitlab-ci/setup-test-env.sh index 1fb8868d8d4..02c7f5ab9b1 100644 --- a/.gitlab-ci/setup-test-env.sh +++ b/.gitlab-ci/setup-test-env.sh @@ -108,5 +108,13 @@ export -f uncollapsed_section_switch # Freedesktop requirement (needed for Wayland) [ -n "${XDG_RUNTIME_DIR}" ] || export XDG_RUNTIME_DIR="$(mktemp -p "$PWD" -d xdg-runtime-XXXXXX)" +if [ -z "${RESULTS_DIR:-}" ]; then + export RESULTS_DIR="$(pwd)/results" + if [ -e "${RESULTS_DIR}" ]; then + rm -rf "${RESULTS_DIR}" + fi + mkdir -p "${RESULTS_DIR}" +fi + set -E trap 'trap_err $?' ERR