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

Remove repo management packages on update live install path

Browse Source 
A different way to address the same problem as 56936df7 . Let's
just *remove* the repo management packages after we're done
creating the repos. dnf will automatically remove the unused
dependencies too. This fixes the python-cryptography case at
least - I tested.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-02-22 15:57:02 -08:00
parent 9a0ef37a25
commit bb3492ac9d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/utils.pm
View File

@ -466,7 +466,7 @@ sub setup_workaround_repo {
# for any release, the hash can be empty and this will do nothing # for any release, the hash can be empty and this will do nothing
my $version = shift || get_var("VERSION"); my $version = shift || get_var("VERSION");
cleanup_workaround_repo; cleanup_workaround_repo;
script_run "dnf -y install bodhi-client createrepo koji", 300; script_run "dnf -y install bodhi-client createrepo_c koji", 300;
# write a repo config file, unless this is the support_server test # write a repo config file, unless this is the support_server test
# and it is running on a different release than the update is for # and it is running on a different release than the update is for
# (in this case we need the repo to exist but do not want to use # (in this case we need the repo to exist but do not want to use
@ -610,7 +610,7 @@ sub _repo_setup_updates {
assert_script_run "dnf -y install glibc-langpack-en", 300; assert_script_run "dnf -y install glibc-langpack-en", 300;
assert_script_run "export LC_ALL=en_US.UTF-8"; assert_script_run "export LC_ALL=en_US.UTF-8";
} }
script_run "dnf -y install bodhi-client createrepo koji", 300; script_run "dnf -y install bodhi-client createrepo_c koji", 300;
# download the packages # download the packages
if (get_var("ADVISORY_NVRS") || get_var("ADVISORY_NVRS_1")) { if (get_var("ADVISORY_NVRS") || get_var("ADVISORY_NVRS_1")) {
@ -677,11 +677,11 @@ sub _repo_setup_updates {
# already and we want to fail if they weren't, or CANNED # already and we want to fail if they weren't, or CANNED
# tests, there's no point updating the toolbox # tests, there's no point updating the toolbox
script_run "dnf -y update", 1200 unless (get_var("UPGRADE") || get_var("INSTALL") || get_var("CANNED")); script_run "dnf -y update", 1200 unless (get_var("UPGRADE") || get_var("INSTALL") || get_var("CANNED"));
# however, on liveinst tests, we need to update the packages # on liveinst tests, we'll remove the packages we installed
# we installed above, just in case they're in the update # above (and their deps, which dnf will include automatically),
# under test; otherwise we get a bogus failure for the package # just in case they're in the update under test; otherwise we
# not being updated # get a bogus failure for the package not being updated
script_run "dnf -y update bodhi-client createrepo koji", 600 if (get_var("INSTALL") && !get_var("CANNED")); script_run "dnf -y remove bodhi-client createrepo koji", 600 if (get_var("INSTALL") && !get_var("CANNED"));
} }
# exit the toolbox on CANNED # exit the toolbox on CANNED
if (get_var("CANNED")) { if (get_var("CANNED")) {