From 3a0d1bb2de26da241fc4876336471847a88e5d09 Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <henrywangxf@me.com>
Date: Tue, 6 Apr 2021 22:13:06 +0800
Subject: [PATCH] test: Remove selinux work around and Schutzfile osbuild
 pinning

Since selinux fix has been release in osbuild 27.1 and it's in
nightly compose. It's time to remove selinux work around and Schutzfile
osbuild pinning
---
 Schutzfile              | 7 -------
 test/cases/ostree-ng.sh | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/Schutzfile b/Schutzfile
index 78650951f..0b9f37463 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -21,13 +21,6 @@
       }
     }
   },
-  "rhel-8.4": {
-    "dependencies": {
-      "osbuild": {
-        "commit": "5de2d3f96bd4841738846d5e4f1e0e4ed01e7a2a"
-      }
-    }
-  },
   "centos-8": {
     "dependencies": {
       "osbuild": {
diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index 8b97fd904..3c3918263 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -253,8 +253,6 @@ sudo podman rmi -f -a
 greenprint "🗜 Extracting and running the image"
 IMAGE_FILENAME="${COMPOSE_ID}-rhel84-container.tar"
 sudo podman pull "oci-archive:${IMAGE_FILENAME}"
-# Workaound for issue https://bugzilla.redhat.com/show_bug.cgi?id=1933774
-sudo restorecon -R /var/lib/containers/storage/overlay/
 sudo podman images
 # Clear image file
 sudo rm -f "$IMAGE_FILENAME"
@@ -465,8 +463,6 @@ sudo podman rmi -f -a
 greenprint "🗜 Extracting and running the image"
 IMAGE_FILENAME="${COMPOSE_ID}-rhel84-container.tar"
 sudo podman pull "oci-archive:${IMAGE_FILENAME}"
-# Workaound for issue https://bugzilla.redhat.com/show_bug.cgi?id=1933774
-sudo restorecon -R /var/lib/containers/storage/overlay/
 sudo podman images
 # Clear image file
 sudo rm -f "$IMAGE_FILENAME"