merge develop to main #173

Merged
tcooper merged 11 commits from develop into main 2023-05-03 06:57:56 +00:00
Showing only changes of commit c185b5d074 - Show all commits

View File

@ -14,6 +14,10 @@ sub run {
# update the fake pandoc-common (should come from the real repo)
# this can take a long time if we get unlucky with the metadata refresh
assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update pandoc-common', 600;
if (get_var("DISTRI") eq "rocky") {
# pandoc-common is in PowerTools in RockyLinux
assert_script_run 'dnf config-manager --set-enabled powertools', 60;
}
# check we got the updated version
verify_updated_packages;
# now remove pandoc-common, and see if we can do a straight