Workaround f30 compose/buildroot mismatch

The f30 tag is currently a lot fresher than what's in the repos,
because we haven't had a compose for five days. This causes
problems in some F30 update tests because the update works fine
with what's in the `f30` tag but not what's on the mirrors. To
deal with this until we get a successful compose, let's just
enable the f30-build repo in the update test process...

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-03-06 10:41:16 -08:00
parent b35492e8b5
commit bb8d9d26d7

View File

@ -465,6 +465,12 @@ sub _repo_setup_updates {
# it on the actual support_server system) # it on the actual support_server system)
unless (get_var("TEST") eq "support_server" && get_var("VERSION") ne get_var("CURRREL")) { unless (get_var("TEST") eq "support_server" && get_var("VERSION") ne get_var("CURRREL")) {
assert_script_run 'printf "[advisory]\nname=Advisory repo\nbaseurl=file:///opt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0" > /etc/yum.repos.d/advisory.repo'; assert_script_run 'printf "[advisory]\nname=Advisory repo\nbaseurl=file:///opt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0" > /etc/yum.repos.d/advisory.repo';
# FIXME 2019-03-06: as we haven't had an F30 compose for days,
# buildroot and 'fedora' repo are mismatched. Enable the f30-build
# repo for now to deal with this. Remove once we have a compose
if (get_var("VERSION") eq "30") {
assert_script_run 'printf "[f30-build]\nname=f30-build repo\nbaseurl=https://kojipkgs.fedoraproject.org/repos/f30-build/latest/\$basearch/\nenabled=1\nmetadata_expire=3600\ngpgcheck=0" > /etc/yum.repos.d/f30-build.repo';
}
# run an update now (except for upgrade tests) # run an update now (except for upgrade tests)
script_run "dnf -y update", 600 unless (get_var("UPGRADE")); script_run "dnf -y update", 600 unless (get_var("UPGRADE"));
} }