From 7be16956d762d6962af416fe9e63ec9150f21f10 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 20 Jun 2023 12:27:30 +0200 Subject: [PATCH] Use "dnf group install" not "dnf groupinstall" (dnf5 support) dnf4 and dnf5 both support the former, dnf5 does not support the latter. Signed-off-by: Adam Williamson --- tests/_setup_browser.pm | 2 +- tests/realmd_join_sssd.pm | 2 +- tests/role_deploy_domain_controller.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/_setup_browser.pm b/tests/_setup_browser.pm index d476b3ad..fe93459a 100644 --- a/tests/_setup_browser.pm +++ b/tests/_setup_browser.pm @@ -8,7 +8,7 @@ sub run { # set up appropriate repositories repo_setup(); # install X environment - assert_script_run "dnf -y groupinstall 'base-x'", 300; + assert_script_run "dnf -y group install 'base-x'", 300; # install firefox, plus our basic default fonts to try and avoid # random weird font selection happening assert_script_run "dnf -y install firefox google-noto-sans-vf-fonts google-noto-sans-mono-vf-fonts google-noto-serif-vf-fonts", 180; diff --git a/tests/realmd_join_sssd.pm b/tests/realmd_join_sssd.pm index 911a03f9..cf8f4ed8 100644 --- a/tests/realmd_join_sssd.pm +++ b/tests/realmd_join_sssd.pm @@ -40,7 +40,7 @@ sub run { if (get_var("FREEIPA_REPLICA")) { # here we're enrolling not just as a client, but as a replica # install server packages - assert_script_run "dnf -y groupinstall freeipa-server", 600; + assert_script_run "dnf -y group install freeipa-server", 600; # we need a lot of entropy for this, and we don't care how good # it is, so let's use haveged diff --git a/tests/role_deploy_domain_controller.pm b/tests/role_deploy_domain_controller.pm index 994b82eb..65a3d364 100644 --- a/tests/role_deploy_domain_controller.pm +++ b/tests/role_deploy_domain_controller.pm @@ -26,7 +26,7 @@ sub run { assert_script_run 'mkdir -p /etc/systemd/system/named-pkcs11.service.d'; assert_script_run 'printf "[Service]\nEnvironment=OPTIONS=-d5\n" > /etc/systemd/system/named-pkcs11.service.d/debug.conf'; # First install the necessary packages - assert_script_run "dnf -y groupinstall freeipa-server", 600; + assert_script_run "dnf -y group install freeipa-server", 600; # configure the firewall for my $service (qw(freeipa-ldap freeipa-ldaps dns)) { assert_script_run "firewall-cmd --permanent --add-service $service";