From 68cb3eb464d1173c2ad60c15dc11b1bce87ebf2c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: May 01 2019 15:33:02 +0000
Subject: Remove branched buildroot repo workaround


For now, anyway...thinking of bringing this back in a more
generic form later.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/lib/utils.pm b/lib/utils.pm
index 6c1bf2a..bae8a63 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -437,12 +437,6 @@ sub _repo_setup_updates {
     # it on the actual support_server system)
     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';
-        # 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)
         script_run "dnf -y update", 900 unless (get_var("UPGRADE"));
     }