From 7ee071ca08eb874b0bdbdac534f6b11e0298d22f Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 24 Jun 2020 09:31:40 -0700
Subject: [PATCH] Add g-i-s timezone bug fix updates as workarounds

This should avoid the bug happening in upgrade tests (I already
built the fix into the base disk image, which should avoid it
happening in other tests).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 lib/utils.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/utils.pm b/lib/utils.pm
index 3ac58491..fb7b9845 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -443,8 +443,9 @@ sub setup_workaround_repo {
     assert_script_run "pushd /opt/workarounds_repo";
     my %workarounds = (
         "30" => [],
-        "31" => [],
-        "32" => []
+        # gnome-initial-setup timezone bug fix
+        "31" => ["FEDORA-2020-da78f28e61"],
+        "32" => ["FEDORA-2020-74b4efe302"]
     );
     # then we'll download each update for our release:
     my $advisories = $workarounds{$version};