From 66e143ada2b9e902cae2c63536f276ac84664f9a Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 9 Jun 2021 09:48:33 +0200
Subject: [PATCH] Revert "CI: Fix libvirt errors caused by latest edk2-ovmf"

libvirt-6.0.0-36.el8 was built [0] and released for CentOS Stream 8. It
includes a backport of a commit [1] from libvirt 7.4.0 to avoid erroring
out on unknown firmware features, which fixes the issue seen with the
newer edk2-ovmf package.

This reverts commit 1e14fa3a24fa64b84cc993c985e696a9cba78dea.

[0] https://koji.mbox.centos.org/koji/buildinfo?buildID=17918
[1] https://github.com/libvirt/libvirt/commit/61d95a1073833ec4323c1ef28e71e913c55aa7b9

Change-Id: Ibe177fe078769204c7e89c04e40870890fe501ba
---
 playbooks/kayobe-seed-vm-base/pre.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/playbooks/kayobe-seed-vm-base/pre.yml b/playbooks/kayobe-seed-vm-base/pre.yml
index 5fd37810f..8a369a6b7 100644
--- a/playbooks/kayobe-seed-vm-base/pre.yml
+++ b/playbooks/kayobe-seed-vm-base/pre.yml
@@ -55,12 +55,3 @@
         cmd: dev/install.sh &> {{ logs_dir }}/ansible/install
         chdir: "{{ kayobe_src_dir }}"
         executable: /bin/bash
-
-    # TODO(priteau): Remove when edk2-ovmf bug is resolved upstream
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1961562
-    - name: Exclude buggy edk2-ovmf package version
-      lineinfile:
-        path: /etc/yum.repos.d/CentOS-Stream-AppStream.repo
-        line: exclude=edk2-ovmf-20200602gitca407c7246bf-5.el8
-      become: true
-      when: ansible_os_family == 'RedHat'