testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-16 10:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't comment out metalink lines in repo files for modular

Browse Source 
We can't easily do the 'point to the compose' fixup.
This commit is contained in:
Adam Williamson 2017-11-06 16:20:40 -08:00
parent aaba51768e
commit 833502c880
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/utils.pm
View File

@ -325,10 +325,11 @@ sub _repo_setup_compose {
if (get_var("MODULAR")) { if (get_var("MODULAR")) {
# dnf config-manager not currently available on modular composes # dnf config-manager not currently available on modular composes
assert_script_run "sed -i -e 's,enabled=1,enabled=0,g' /etc/yum.repos.d/fedora-modular-server-updates-testing.repo /etc/yum.repos.d/fedora-modular-server-updates.repo'"; assert_script_run "sed -i -e 's,enabled=1,enabled=0,g' /etc/yum.repos.d/fedora-modular-server-updates-testing.repo /etc/yum.repos.d/fedora-modular-server-updates.repo'";
# FIXME use the compose repo, as per below - easier if the repo
# files had commented-out baseurl lines
} }
else { else {
assert_script_run 'dnf config-manager --set-disabled updates-testing updates'; assert_script_run 'dnf config-manager --set-disabled updates-testing updates';
}
# we use script_run here as the rawhide repo file won't always exist # we use script_run here as the rawhide repo file won't always exist
# and we don't want to bother testing or predicting its existence; # and we don't want to bother testing or predicting its existence;
# assert_script_run doesn't buy you much with sed anyway as it'll # assert_script_run doesn't buy you much with sed anyway as it'll
@ -336,6 +337,7 @@ sub _repo_setup_compose {
script_run "sed -i -e 's,^metalink,#metalink,g' -e 's,^#baseurl.*basearch,baseurl=${location}/Everything/\$basearch,g' -e 's,^#baseurl.*source,baseurl=${location}/Everything/source,g' /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0; script_run "sed -i -e 's,^metalink,#metalink,g' -e 's,^#baseurl.*basearch,baseurl=${location}/Everything/\$basearch,g' -e 's,^#baseurl.*source,baseurl=${location}/Everything/source,g' /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0;
script_run "cat /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0; script_run "cat /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0;
} }
}
sub _repo_setup_updates { sub _repo_setup_updates {
# Appropriate repo setup steps for testing a Bodhi update # Appropriate repo setup steps for testing a Bodhi update