ci: Remove amazon-ec2-utils when running tests in AWS

This package creates symlinks for NVMe drives that breaks our tests.
storaged-project · Sep 24, 2024 · 303a5bf · 303a5bf
1 parent 594b960
commit 303a5bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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