From 329d8783430dc155d71f3d5dbe05ea190949b184 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 22 Aug 2023 00:18:13 -0700 Subject: [PATCH] Revert "workaround odd dnf issues with samba-4.19.0-0.3.rc2 updates" This reverts commit 511b5382ec0ececf6ebbb30ec27861b3450f17b7. The updates have gone stable and we don't need the workaround. --- tests/realmd_join_sssd.pm | 5 ----- tests/role_deploy_domain_controller.pm | 4 ---- tests/samba_domain_controller.pm | 8 +------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/tests/realmd_join_sssd.pm b/tests/realmd_join_sssd.pm index 750e2b1f..f79c121d 100644 --- a/tests/realmd_join_sssd.pm +++ b/tests/realmd_join_sssd.pm @@ -37,11 +37,6 @@ sub run { # here we're enrolling not just as a client, but as a replica # install server packages assert_script_run "dnf -y group install freeipa-server", 600; - my $advortask = get_var("ADVISORY_OR_TASK"); - if ($advortask eq "FEDORA-2023-d21ee6d2e9" || $advortask eq "FEDORA-2023-b2095d4ea1") { - assert_script_run "dnf -y --best update samba*", 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 4e1d0799..0ad1293d 100644 --- a/tests/role_deploy_domain_controller.pm +++ b/tests/role_deploy_domain_controller.pm @@ -27,10 +27,6 @@ sub run { 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 group install freeipa-server", 600; - my $advortask = get_var("ADVISORY_OR_TASK"); - if ($advortask eq "FEDORA-2023-d21ee6d2e9" || $advortask eq "FEDORA-2023-b2095d4ea1") { - assert_script_run "dnf -y --best update samba*", 600; - } # configure the firewall for my $service (qw(freeipa-ldap freeipa-ldaps dns)) { assert_script_run "firewall-cmd --permanent --add-service $service"; diff --git a/tests/samba_domain_controller.pm b/tests/samba_domain_controller.pm index 9adcd609..684e1d39 100644 --- a/tests/samba_domain_controller.pm +++ b/tests/samba_domain_controller.pm @@ -26,13 +26,7 @@ sub run { assert_script_run 'systemctl start haveged.service'; assert_script_run "rm -f /etc/samba/smb.conf"; # First install the necessary packages - my $advortask = get_var("ADVISORY_OR_TASK"); - if ($advortask eq "FEDORA-2023-d21ee6d2e9" || $advortask eq "FEDORA-2023-b2095d4ea1") { - assert_script_run "dnf -y --best install samba-dc samba-tools krb5-workstation adcli", 600; - } - else { - assert_script_run "dnf -y install samba-dc samba-tools krb5-workstation adcli", 600; - } + assert_script_run "dnf -y install samba-dc samba-tools krb5-workstation adcli", 600; # configure the firewall assert_script_run "firewall-cmd --permanent --add-service samba-dc"; assert_script_run "systemctl restart firewalld.service";