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

dnf seems to have some odd trouble with these updates. It
 really wants to use the older 2.rc2 builds, even though there
doesn't seem to be any actual *problem* with the 3.rc2 builds.

For the samba server test, passing `--best` to dnf seems to be
enough to make it use the .3.rc2 builds. For the FreeIPA tests,
we have to do a second pass with `--best` after the initial
install.

It's weird that we have to do this, but to get these updates
through - because there doesn't really seem to be a problem
here - let's do it. They will replace the 2.rc2 builds in the
main F39 and Rawhide trees once they land in 'stable' so the
problem shouldn't persist.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-08-16 11:20:39 -07:00
parent b4b98235ac
commit 511b5382ec
3 changed files with 16 additions and 1 deletions

View File

@ -37,6 +37,11 @@ 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

View File

@ -27,6 +27,10 @@ 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";

View File

@ -26,7 +26,13 @@ sub run {
assert_script_run 'systemctl start haveged.service';
assert_script_run "rm -f /etc/samba/smb.conf";
# First install the necessary packages
assert_script_run "dnf -y install samba-dc samba-tools krb5-workstation adcli", 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 install samba-dc samba-tools krb5-workstation adcli", 600;
}
else {
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";