From: Colin Walters <walters@verbum.org>
Date: Thu, 2 May 2024 18:18:10 +0000 (-0400)
Subject: ci: Also skip if we detect /run/.containerenv
X-Git-Tag: archive/raspbian/2024.8-1+rpi1^2~7^2~2^2~5^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3d3f0b8d3184ff8baf25d442301edf85ba46317c;p=ostree.git

ci: Also skip if we detect /run/.containerenv
---

diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c
index 86536fc2..5643db70 100644
--- a/tests/test-libarchive-import.c
+++ b/tests/test-libarchive-import.c
@@ -629,7 +629,9 @@ test_libarchive_selinux (gconstpointer data)
 
   if (skip_if_no_xattr (td))
     goto out;
-  if (getenv ("container"))
+  // xref https://bugzilla.redhat.com/show_bug.cgi?id=2278652
+  if (getenv ("container") || g_file_test ("/run/.containerenv", G_FILE_TEST_EXISTS)
+      || g_file_test ("/.dockerenv", G_FILE_TEST_EXISTS))
     {
       // FIXME dedup this with libtest.sh have_selinux_relabel
       g_test_skip ("skip in containers for now");