From ee5e9bd243d2274e230583a4562e422dfae08c38 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 16 Mar 2024 10:51:04 +0100 Subject: [PATCH] fmf: Use correct os-release With commit 2e8b932e, run-test.sh now runs inside the cockpit/tasks container, and its os-release is irrelevant. Read the host's os-release instead to compute a correct `$TEST_OS`. --- test/browser/browser.sh | 1 + test/browser/run-test.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/browser/browser.sh b/test/browser/browser.sh index 9db41ab..db0d7ba 100755 --- a/test/browser/browser.sh +++ b/test/browser/browser.sh @@ -36,5 +36,6 @@ exec podman \ --security-opt=label=disable \ --volume="${TMT_TEST_DATA}":/logs:rw,U --env=LOGS=/logs \ --volume="$(pwd)":/source:rw,U --env=SOURCE=/source \ + --volume=/usr/lib/os-release:/run/host/usr/lib/os-release:ro \ "${CONTAINER}" \ sh /source/test/browser/run-test.sh diff --git a/test/browser/run-test.sh b/test/browser/run-test.sh index d50becb..e1b5fa0 100644 --- a/test/browser/run-test.sh +++ b/test/browser/run-test.sh @@ -20,7 +20,7 @@ fi # disable detection of affected tests; testing takes too long as there is no parallelization mv .git dot-git -. /etc/os-release +. /run/host/usr/lib/os-release export TEST_OS="${ID}-${VERSION_ID/./-}" if [ "${TEST_OS#centos-}" != "$TEST_OS" ]; then