srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-22 14:03:09 +00:00
Code Issues Releases Activity

Revert "workaround odd dnf issues with samba-4.19.0-0.3.rc2 updates"

Browse Source 
This reverts commit 511b5382ec.
The updates have gone stable and we don't need the workaround.
This commit is contained in:
Adam Williamson 2023-08-22 00:18:13 -07:00
parent 2e330f78ab
commit 0349058d61
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/realmd_join_sssd.pm
View File

@ -37,11 +37,6 @@ sub run {
# here we're enrolling not just as a client, but as a replica # here we're enrolling not just as a client, but as a replica
# install server packages # install server packages
assert_script_run "dnf -y group install freeipa-server", 600; 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 # we need a lot of entropy for this, and we don't care how good
# it is, so let's use haveged # it is, so let's use haveged

4
tests/role_deploy_domain_controller.pm
View File

@ -27,10 +27,6 @@ sub run {
assert_script_run 'printf "[Service]\nEnvironment=OPTIONS=-d5\n" > /etc/systemd/system/named-pkcs11.service.d/debug.conf'; assert_script_run 'printf "[Service]\nEnvironment=OPTIONS=-d5\n" > /etc/systemd/system/named-pkcs11.service.d/debug.conf';
# First install the necessary packages # First install the necessary packages
assert_script_run "dnf -y group install freeipa-server", 600; 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 # configure the firewall
for my $service (qw(freeipa-ldap freeipa-ldaps dns)) { for my $service (qw(freeipa-ldap freeipa-ldaps dns)) {
assert_script_run "firewall-cmd --permanent --add-service $service"; assert_script_run "firewall-cmd --permanent --add-service $service";

6
tests/samba_domain_controller.pm
View File

@ -26,13 +26,7 @@ sub run {
assert_script_run 'systemctl start haveged.service'; assert_script_run 'systemctl start haveged.service';
assert_script_run "rm -f /etc/samba/smb.conf"; assert_script_run "rm -f /etc/samba/smb.conf";
# First install the necessary packages # 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 # configure the firewall
assert_script_run "firewall-cmd --permanent --add-service samba-dc"; assert_script_run "firewall-cmd --permanent --add-service samba-dc";
assert_script_run "systemctl restart firewalld.service"; assert_script_run "systemctl restart firewalld.service";