mirror of
https://github.com/rocky-linux/os-autoinst-distri-rocky.git
synced 2024-11-22 05:01:25 +00:00
Replace jss workaround with selinux and nss workarounds
The jss updates all went stable already. Now we have a problem with SELinux, upower and container-selinux (we need a newer selinux-policy to avoid upower failures in the services_start test, but the first attempt to fix it caused the desktop_updates test to start failing because container-selinux needed adapting to changes in selinux-policy...let's just pull in the updates with the latest versions of both to be safe), and one with NSS that causes Firefox to give false certificate errors sometimes (this is particularly affecting the FreeIPA browser test). As usual these should be dropped once the updates go stable. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
629c67e1f5
commit
3511a5b57b
15
lib/utils.pm
15
lib/utils.pm
@ -503,9 +503,18 @@ sub _repo_setup_updates {
|
|||||||
# installed, but was not
|
# installed, but was not
|
||||||
assert_script_run 'rpm -qp *.rpm --qf "%{NAME} " > /var/log/updatepkgnames.txt';
|
assert_script_run 'rpm -qp *.rpm --qf "%{NAME} " > /var/log/updatepkgnames.txt';
|
||||||
upload_logs "/var/log/updatepkgnames.txt";
|
upload_logs "/var/log/updatepkgnames.txt";
|
||||||
# FIXME workaround #1766451; remove this once the updates are all
|
# FIXME make sure we have good selinux-policy/container-selinux
|
||||||
# stable
|
# to avoid issues in GNOME Software and/or upower; remove when
|
||||||
assert_script_run "koji download-build --arch=" . get_var("ARCH") . " --arch=noarch jss-4.6.2-2.fc" . get_var("VERSION"), 600;
|
# updates go stable
|
||||||
|
my $seladvisory = "FEDORA-2019-fefda9dd5e"; # F31
|
||||||
|
$seladvisory = "FEDORA-2019-e9d8868185" if (get_var("VERSION") eq "30");
|
||||||
|
assert_script_run "bodhi updates download --updateid=$seladvisory", 180;
|
||||||
|
# FIXME hopefully avoid certificate errors particularly in freeipa
|
||||||
|
# tests; remove when updates go stable
|
||||||
|
my $nssadvisory = "FEDORA-2019-ff27bbf69a"; # F31
|
||||||
|
$nssadvisory = "FEDORA-2019-8fbc65ef9e" if (get_var("VERSION") eq "30");
|
||||||
|
assert_script_run "bodhi updates download --updateid=$nssadvisory", 180;
|
||||||
|
|
||||||
# create the repo metadata
|
# create the repo metadata
|
||||||
assert_script_run "createrepo .";
|
assert_script_run "createrepo .";
|
||||||
# write a repo config file, unless this is the support_server test
|
# write a repo config file, unless this is the support_server test
|
||||||
|
Loading…
Reference in New Issue
Block a user