From 95f4bb3199184174d13c3844ba44f6cefb1615bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Fri, 17 May 2024 08:55:09 +0200 Subject: [PATCH 1/3] tests: do not use `dnf config-manager` ... because the current syntax is not compatible with dnf5 and plain `echo` is much simpler. --- tests/simple_build/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/simple_build/test.sh b/tests/simple_build/test.sh index eddb918..cef95c7 100755 --- a/tests/simple_build/test.sh +++ b/tests/simple_build/test.sh @@ -14,7 +14,7 @@ rlJournalStart # By default the testing-farm-tag-repository has higher priority # than our development COPR repo. Therefore, we need to flip the # priorities and update the packages manually. - rlRun "dnf config-manager --save --setopt='copr:copr.fedorainfracloud.org:group_codescan:csutils.priority=1'" + rlRun "echo 'priority=1' >> /etc/yum.repos.d/group_codescan-csutils-*.repo" rlRun "dnf upgrade -y 'cs*'" fi From 4f09de8fc3932c7f12ecacf2e4dc4800b50776e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Fri, 17 May 2024 10:11:57 +0200 Subject: [PATCH 2/3] tests: replace `dnf` with `yum` for compatibility with EPEL 7 `yum` is still provided as a symlink to `dnf` even with `dnf5`. --- tests/simple_build/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/simple_build/test.sh b/tests/simple_build/test.sh index cef95c7..a35648e 100755 --- a/tests/simple_build/test.sh +++ b/tests/simple_build/test.sh @@ -15,7 +15,7 @@ rlJournalStart # than our development COPR repo. Therefore, we need to flip the # priorities and update the packages manually. rlRun "echo 'priority=1' >> /etc/yum.repos.d/group_codescan-csutils-*.repo" - rlRun "dnf upgrade -y 'cs*'" + rlRun "yum upgrade -y 'cs*'" fi if [ -z "$TEST_PACKAGE" ]; then From 7d47a88a112e15002953649249d7cefe26464c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Fri, 17 May 2024 08:56:05 +0200 Subject: [PATCH 3/3] tests: edit csutils repo priority only in Testing Farm --- tests/simple_build/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/simple_build/test.sh b/tests/simple_build/test.sh index a35648e..9c0106e 100755 --- a/tests/simple_build/test.sh +++ b/tests/simple_build/test.sh @@ -10,7 +10,7 @@ TEST_USER="csmock" rlJournalStart rlPhaseStartSetup # use the latest csutils in the Testing Farm - if rlIsFedora || rlIsRHELLike '>7'; then + if test "$PACKIT_FULL_REPO_NAME"; then # By default the testing-farm-tag-repository has higher priority # than our development COPR repo. Therefore, we need to flip the # priorities and update the packages manually.