From 3a7a275c34199cd70b1668c657dad4ae01ad76f1 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 2 Aug 2022 14:19:48 -0400
Subject: [PATCH 1/2] Cirrus: use dnf instead of rpm to install packages

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 contrib/cirrus/setup_environment.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index c3b7811bcf..f84f78ee98 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -277,7 +277,7 @@ case "$TEST_FLAVOR" in
         ;&  # continue with next item
     compose)
         make install.tools
-        rpm -ivh $PACKAGE_DOWNLOAD_DIR/podman-docker*
+        dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker*
         ;&  # continue with next item
     int) ;&
     sys) ;&
@@ -307,7 +307,7 @@ case "$TEST_FLAVOR" in
         install_test_configs
         ;;
     machine)
-        rpm -ivh $PACKAGE_DOWNLOAD_DIR/podman-gvproxy*
+        dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-gvproxy*
         remove_packaged_podman_files
         make install.tools
         make install PREFIX=/usr ETCDIR=/etc

From 50981cb8468001e9a3c5af2b0a0670ce35b7e7db Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 3 Aug 2022 08:29:59 -0400
Subject: [PATCH 2/2] skip pod resource limits test on aarch64

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 test/system/200-pod.bats | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
index cbbd62ffb4..b1b9ee5e16 100644
--- a/test/system/200-pod.bats
+++ b/test/system/200-pod.bats
@@ -482,6 +482,7 @@ spec:
     skip_if_remote "resource limits only implemented on non-remote"
     skip_if_rootless "resource limits only work with root"
     skip_if_cgroupsv1 "resource limits only meaningful on cgroups V2"
+    skip_if_aarch64 "FIXME: #15074 - flakes often on aarch64"
 
     # create loopback device
     lofile=${PODMAN_TMPDIR}/disk.img