From f4dd6b4dee42346e0c246e79bb5451d271cedef1 Mon Sep 17 00:00:00 2001
From: Milan Lysonek <mlysonek@redhat.com>
Date: Wed, 3 Jul 2024 10:34:09 +0200
Subject: [PATCH 1/4] Sanity/smoke-test: remove old adjust

---
 Sanity/smoke-test/main.fmf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Sanity/smoke-test/main.fmf b/Sanity/smoke-test/main.fmf
index ec3d35e..a35cee4 100644
--- a/Sanity/smoke-test/main.fmf
+++ b/Sanity/smoke-test/main.fmf
@@ -45,7 +45,3 @@ tier: '1'
 extra-summary: /CoreOS/openscap/Sanity/smoke-test
 extra-task: /CoreOS/openscap/Sanity/smoke-test
 extra-nitrate: TC#0075476
-adjust:
-- enabled: false
-  when: distro < rhel-5
-  continue: false

From eef550c0969bf599a52a468b20885b0f767b3039 Mon Sep 17 00:00:00 2001
From: Milan Lysonek <mlysonek@redhat.com>
Date: Mon, 19 Aug 2024 11:18:21 +0200
Subject: [PATCH 2/4] Sanity/smoke-test: enable only rpms repo, no
 debuginfo/source

---
 Sanity/smoke-test/runtest.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sanity/smoke-test/runtest.sh b/Sanity/smoke-test/runtest.sh
index ff8af27..8c50663 100755
--- a/Sanity/smoke-test/runtest.sh
+++ b/Sanity/smoke-test/runtest.sh
@@ -55,10 +55,10 @@ rlJournalStart
             rlFileBackup "/etc/yum.repos.d/"
             CleanupRegister "rlFileRestore"
             # we have to enable buildroot repo
-            rlRun "dnf config-manager --set-enabled rhel-buildroot{,-debuginfo,-source}" 0-255
+            rlRun "dnf config-manager --set-enabled rhel-buildroot" 0-255
             # Some packages needed to build openscap moved from rhel-buildroot to rhel-CRB
-            rlRun "dnf config-manager --set-enabled rhel-CRB{,-debuginfo,-source}" 0-255
-            rlRun "dnf config-manager --set-enabled beaker-CRB{,-debuginfo,-source}" 0-255
+            rlRun "dnf config-manager --set-enabled rhel-CRB" 0-255
+            rlRun "dnf config-manager --set-enabled beaker-CRB" 0-255
             # AppStream source repo is not enabled by default
             rlRun "dnf config-manager --set-enabled beaker-AppStream-source" 0-255
         fi

From fed7239f8f8a0c87e7aeb08c65bc3dc6c9553fb4 Mon Sep 17 00:00:00 2001
From: Milan Lysonek <mlysonek@redhat.com>
Date: Mon, 19 Aug 2024 11:19:08 +0200
Subject: [PATCH 3/4] Sanity/smoke-test: install pytest for ctest as it's in
 RHEL10 CRB repository

---
 Sanity/smoke-test/runtest.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Sanity/smoke-test/runtest.sh b/Sanity/smoke-test/runtest.sh
index 8c50663..b8eb3c1 100755
--- a/Sanity/smoke-test/runtest.sh
+++ b/Sanity/smoke-test/runtest.sh
@@ -63,6 +63,11 @@ rlJournalStart
             rlRun "dnf config-manager --set-enabled beaker-AppStream-source" 0-255
         fi
 
+        # in RHEL10, pytest is in CRB which is not enabled during tmt preparation phase
+        if rlIsRHEL ">=10"; then
+            rlRun "dnf install -y python3-pytest"
+        fi
+
         rlFetchSrcForInstalled $PACKAGE
         if rlIsRHEL "<=7"; then
             rlRun "yum-builddep -y $PACKAGE*"

From 016433b079bd85911cac35529c460a13fbd29b41 Mon Sep 17 00:00:00 2001
From: Matthew Burket <mburket@redhat.com>
Date: Mon, 6 Apr 2026 10:40:51 -0500
Subject: [PATCH 4/4] Move to ctest for tests

---
 Sanity/smoke-test/runtest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sanity/smoke-test/runtest.sh b/Sanity/smoke-test/runtest.sh
index b8eb3c1..0da0ae4 100755
--- a/Sanity/smoke-test/runtest.sh
+++ b/Sanity/smoke-test/runtest.sh
@@ -121,7 +121,7 @@ rlJournalStart
             rlRun -s "make -C $(readlink -f ${TOPDIR}/BUILD/${PACKAGE}*) check"
             rv=$?
         else
-            rlRun -s "cmake --build $BUILD_DIR_PATH --target test -- ARGS='--output-on-failure'"
+            rlRun -s "ctest --test-dir $BUILD_DIR_PATH --output-on-failure"
             rv=$?
             # cmake output does not contain enough information, submit verbose output log
             FILE="${BUILD_DIR_PATH}/Testing/Temporary/LastTest.log"