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 diff --git a/Sanity/smoke-test/runtest.sh b/Sanity/smoke-test/runtest.sh index ff8af27..0da0ae4 100755 --- a/Sanity/smoke-test/runtest.sh +++ b/Sanity/smoke-test/runtest.sh @@ -55,14 +55,19 @@ 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 + # 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*" @@ -116,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"