From 3eefeae9807331b7ff83175fa45b307f3eb9ae74 Mon Sep 17 00:00:00 2001
From: HuijingHei <hhei@redhat.com>
Date: Wed, 30 Oct 2024 13:42:04 +0800
Subject: [PATCH] tests/kola: remove dtb exceptions in upgrade test SELinux
 checks

Fixes https://github.com/coreos/fedora-coreos-tracker/issues/1808
---
 tests/kola/upgrade/extended/test.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/kola/upgrade/extended/test.sh b/tests/kola/upgrade/extended/test.sh
index 0e069e5a93..4c880d964d 100755
--- a/tests/kola/upgrade/extended/test.sh
+++ b/tests/kola/upgrade/extended/test.sh
@@ -206,8 +206,6 @@ selinux-sanity-check() {
             # Add in a few temporary glob exceptions
             # https://github.com/coreos/fedora-coreos-tracker/issues/1806
             [[ "${path}" =~ /etc/selinux/targeted/active/ ]] && continue
-            # https://github.com/coreos/fedora-coreos-tracker/issues/1808
-            [[ "${path}" =~ /boot/ostree/.*/dtb ]] && continue
             if [[ "${exceptions[$path]:-noexception}" == 'noexception' ]]; then
                 echo "Unexpected mislabeled file found: ${path}"
                 found="1"
@@ -232,6 +230,9 @@ if vereq $version $target_version; then
     if ! echo "$state" | grep -q "CoreOS aleph version"; then
         fatal "check bootupctl status output"
     fi
+    # cleanup the rollback, or will hit wrong dtb selinux label for old deployment
+    # https://github.com/coreos/fedora-coreos-tracker/issues/1808
+    rpm-ostree cleanup -r
     # One last check!
     selinux-sanity-check
     exit 0