From 303a5bf9b14de1fd42b63b027105f9aca2e45041 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 24 Sep 2024 10:11:32 +0200
Subject: [PATCH] ci: Remove amazon-ec2-utils when running tests in AWS

This package creates symlinks for NVMe drives that breaks our
tests.
---
 plans/blivet-gui.fmf | 2 ++
 plans/tests.fmf      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plans/blivet-gui.fmf b/plans/blivet-gui.fmf
index ed1cd0b17..f073256a0 100644
--- a/plans/blivet-gui.fmf
+++ b/plans/blivet-gui.fmf
@@ -14,6 +14,8 @@ prepare:
       # TF prioritizes Fedora tag repo over all others, in particular our daily COPR
       - for f in $(grep -l -r 'testing-farm-tag-repository' /etc/yum.repos.d); do sed -i '/priority/d' "$f" ;done
       - sudo dnf -y update
+      # amazon-ec2-utils creates sda -> nvme symlinks breaking our tests
+      - if rpm -q amazon-ec2-utils; then rpm -e --verbose amazon-ec2-utils && udevadm trigger /dev/nvme* ;fi
 
   - name: ansible
     how: ansible
diff --git a/plans/tests.fmf b/plans/tests.fmf
index 6a6d59044..4d1f9e653 100644
--- a/plans/tests.fmf
+++ b/plans/tests.fmf
@@ -15,6 +15,8 @@ prepare:
       # TF prioritizes Fedora tag repo over all others, in particular our daily COPR
       - for f in $(grep -l -r 'testing-farm-tag-repository' /etc/yum.repos.d); do sed -i '/priority/d' "$f" ;done
       - sudo dnf -y update
+      # amazon-ec2-utils creates sda -> nvme symlinks breaking our tests
+      - if rpm -q amazon-ec2-utils; then rpm -e --verbose amazon-ec2-utils && udevadm trigger /dev/nvme* ;fi
 
   - name: ansible
     how: ansible