From 19f1202cd82d5492edf7d9a50b4afe40c3c92743 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 25 Aug 2025 15:12:19 -0400 Subject: [PATCH] TMT: run systemtest via `make test-system-local` Reuses Makefile logic and also prints SKOPEO_BINARY value Signed-off-by: Lokesh Mandvekar --- systemtest/tmt/main.fmf | 6 +++++- systemtest/tmt/test.sh | 13 ------------- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 systemtest/tmt/test.sh diff --git a/systemtest/tmt/main.fmf b/systemtest/tmt/main.fmf index fd0b3e66..de3517e6 100644 --- a/systemtest/tmt/main.fmf +++ b/systemtest/tmt/main.fmf @@ -10,5 +10,9 @@ adjust: RELEASE_TESTING: true summary: System test -test: bash ./test.sh +test: | + rpm -q containers-common skopeo skopeo-tests + # If these tests are to be run anywhere else, TMT can fetch + # them using the URL and git ref, so git commands should work. + make -C $(git rev-parse --show-toplevel) test-system-local duration: 60m diff --git a/systemtest/tmt/test.sh b/systemtest/tmt/test.sh deleted file mode 100644 index 7c80eba9..00000000 --- a/systemtest/tmt/test.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -exo pipefail - -uname -r - -rpm -q \ - bats \ - containers-common \ - skopeo \ - skopeo-tests \ - -bats /usr/share/skopeo/test/system