From 92338642d14adca907e6002dee82255a3f9032ef Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Wed, 8 May 2024 16:43:46 +0200
Subject: [PATCH] Revert "Temporarily disable rootless debian e2e testing"

This reverts commit 02b8fd7156c93555b0ac1f775aa824ec04224215.
The new CI images should have a apparmor workaround.

Fixes #22625

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 .cirrus.yml | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 3d7a40d15a..ca874e5ef9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -705,25 +705,7 @@ rootless_integration_test_task:
     # Docs: ./contrib/cirrus/CIModes.md
     only_if: *not_tag_branch_build_docs_machine
     depends_on: *build
-    # FIXME: Fails on Debian rootless ref: #22625
-    # matrix: *platform_axis
-    # FIXME: Fails on Debian rootless ref: #22625
-    matrix:  # The following is just like *platform_axis minus Debian
-        - env: *stdenvars
-        - env:
-              DISTRO_NV: ${PRIOR_FEDORA_NAME}
-              VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
-              CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
-              CI_DESIRED_RUNTIME: crun
-              CI_DESIRED_DATABASE: boltdb
-              CI_DESIRED_STORAGE: vfs
-              # Catch invalid "TMPDIR == /tmp" assumptions; PR #19281
-              TMPDIR: /var/tmp
-        - env:
-              <<: *stdenvars
-              DISTRO_NV: ${RAWHIDE_NAME}
-              VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
-              CTR_FQIN: ""
+    matrix: *platform_axis
     gce_instance: *standardvm
     timeout_in: 50m
     env: