From c9ae9c4d672ce759af293b6a9893afa78eb4bb18 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 10 Dec 2019 18:12:13 -0800 Subject: [PATCH] Drop SELinux and NSS update workarounds (went stable) All these updates have gone stable now, so we no longer need these workarounds. Signed-off-by: Adam Williamson --- lib/utils.pm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index 672c85a0..3ee19f2a 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -503,17 +503,6 @@ sub _repo_setup_updates { # installed, but was not assert_script_run 'rpm -qp *.rpm --qf "%{NAME} " > /var/log/updatepkgnames.txt'; upload_logs "/var/log/updatepkgnames.txt"; - # FIXME make sure we have good selinux-policy/container-selinux - # to avoid issues in GNOME Software and/or upower; remove when - # 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 assert_script_run "createrepo .";