From 8eec674dc3f6ba6b23d9cc5d0a0a8d6c18a4998b Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Sun, 1 Dec 2024 11:33:54 +0100 Subject: [PATCH] beaker-tests-sanity: respect COPR_CLEANUP=false directive --- .../Sanity/copr-cli-basic-operations/runtest-createrepo.sh | 2 +- .../Sanity/copr-cli-basic-operations/runtest-storage.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-createrepo.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-createrepo.sh index 81cd49174..dd3b68eee 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-createrepo.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-createrepo.sh @@ -34,7 +34,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartCleanup - rlRun "copr-cli delete ${NAME_PREFIX}Createrepo" + cleanProject "${NAME_PREFIX}Createrepo" rlRun "dnf -y copr remove ${URL}/${NAME_PREFIX}Createrepo" rlPhaseEnd rlJournalPrintText diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-storage.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-storage.sh index cdec608cd..94e414e9a 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-storage.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-storage.sh @@ -47,12 +47,11 @@ rlJournalStart rlAssertRpm "hello" rlRun "dnf remove hello -y" rlRun "yes | dnf copr remove $DNF_COPR_ID/$project" - - rlRun "copr-cli delete $project" done rlPhaseEnd rlPhaseStartCleanup + cleanProject "$project" workdirCleanup rlPhaseEnd rlJournalPrintText