consider Rocky Linux version when adding powertools/crb

This commit is contained in:
Trevor Cooper 2023-05-05 20:57:13 -07:00
parent 1bd07441d9
commit 7361baef9f
Signed by: tcooper
GPG Key ID: 52364D7BBCEB35B8

View File

@ -5,21 +5,34 @@ use packagetest;
sub run { sub run {
my $self = shift; my $self = shift;
# switch to TTY3 for both, graphical and console tests # switch to TTY3 for both, graphical and console tests
$self->root_console(tty => 3); $self->root_console(tty => 3);
# enable test repos and install test packages # enable test repos and install test packages
prepare_test_packages; prepare_test_packages;
# check rpm agrees they installed good # check rpm agrees they installed good
verify_installed_packages; verify_installed_packages;
if (get_var("DISTRI") eq "rocky") { if (get_var("DISTRI") eq "rocky") {
# pandoc-common is in PowerTools in RockyLinux if (get_version_major() < 9) {
assert_script_run 'dnf config-manager --set-enabled powertools', 60;
# pandoc-common is in PowerTools in Rocky Linux 8
assert_script_run 'dnf config-manager --set-enabled powertools', 60;
}
else {
# pandoc-common is in CRB in Rocky Linux 8
assert_script_run 'dnf config-manager --set-enabled crb', 60;
}
} }
# update the fake pandoc-common (should come from the real repo) # 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 # 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; assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update pandoc-common', 600;
# check we got the updated version # check we got the updated version
verify_updated_packages; verify_updated_packages;
# now remove pandoc-common, and see if we can do a straight # now remove pandoc-common, and see if we can do a straight
# install from the default repos # install from the default repos
assert_script_run 'dnf -y remove pandoc-common'; assert_script_run 'dnf -y remove pandoc-common';