From 7ca9f74e592c35cdc5f1ae7d2c408964ce6ed169 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 21 Sep 2023 08:55:26 +0200 Subject: [PATCH] basic-upstream-test-suite: Use rlFetchSrcForInstalled outside of rlRun Running it inside rlRun probably causes errors and warnings in CI on MR, which are not influencing the final result, but confuses the reviewer: :: [ 15:00:58 ] :: [ PASS ] :: Command 'pushd /tmp/tmp.bUJ2DPhtrS' (Expected 0, got 0) :: [ 15:00:58 ] :: [ LOG ] :: rlFetchSrcForInstalled: Fetching source rpm for installed cups-2.4.7-1.fc40 :: [ 15:00:58 ] :: [ LOG ] :: trying download from 'https://kojipkgs.fedoraproject.org/packages/cups/2.4.7/1.fc40/src/cups-2.4.7-1.fc40.src.rpm' :: [ 15:00:58 ] :: [ WARNING ] :: package 'cups-2.4.7-1.fc40.src.rpm' was not successfully downloaded :: [ 15:00:58 ] :: [ LOG ] :: trying download from 'https://kojipkgs.fedoraproject.org/packages/cups/2.4.7/1.fc40/src/cups-2.4.7-1.fc40.src.rpm' :: [ 15:00:58 ] :: [ WARNING ] :: package 'cups-2.4.7-1.fc40.src.rpm' was not successfully downloaded :: [ 15:00:59 ] :: [ ERROR ] :: parsing package info 'cups 2.4.7 1.fc40 src (none) cups 2.4.7 1.fc40 x86_64 cups-2.4.7-1.fc40.src.rpm' failed :: [ 15:00:59 ] :: [ LOG ] :: trying download from 'https://kojipkgs.fedoraproject.org/packages////src/--.src.rpm' :: [ 15:00:59 ] :: [ WARNING ] :: package '--.src.rpm' was not successfully downloaded :: [ 15:01:00 ] :: [ LOG ] :: trying download from 'https://kojipkgs.fedoraproject.org/packages/cups/2.4.7/1.fc40/src/cups-2.4.7-1.fc40.src.rpm' :: [ 15:01:00 ] :: [ WARNING ] :: package 'cups-2.4.7-1.fc40.src.rpm' was not successfully downloaded :: [ 15:01:00 ] :: [ ERROR ] :: could not find buildID :: [ 15:01:00 ] :: [ ERROR ] :: could not find package url :: [ 15:01:00 ] :: [ ERROR ] :: package 'cups-2.4.7-1.fc40.src.rpm' was not successfully downloaded :: [ 15:01:00 ] :: [ WARNING ] :: could not get package using method 'direct' :: [ 15:01:06 ] :: [ PASS ] :: Fetching the source rpm (Expected 0, got 0) Let's see if running outside of rlRun helps. --- Sanity/basic-upstream-test-suite/runtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sanity/basic-upstream-test-suite/runtest.sh b/Sanity/basic-upstream-test-suite/runtest.sh index e328007..a5b7853 100755 --- a/Sanity/basic-upstream-test-suite/runtest.sh +++ b/Sanity/basic-upstream-test-suite/runtest.sh @@ -45,7 +45,7 @@ rlJournalStart rlRun "pushd $TmpDir" # extract rpm - rlRun "rlFetchSrcForInstalled $PACKAGE" 0 "Fetching the source rpm" + rlFetchSrcForInstalled $PACKAGE rlRun "rpm --define '_topdir $TmpDir' -i *src.rpm" 0 "Installing the source rpm" rlRun "su cupstester -c 'mkdir BUILD'" 0 "Create BUILD directory" rlRun "su cupstester -c $'rpmbuild --nodeps --define \'_topdir $TmpDir\' -bp $TmpDir/SPECS/*spec'" 0 "Preparing sources"