Merge pull request #21271 from edsantiago/reenable_fixed_flakes

CI: reenable tests that are working again
containers · Jan 17, 2024 · c187687 · c187687
2 parents 2981262 + e66413b
commit c187687
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/test/system/125-import.bats b/test/system/125-import.bats
@@ -44,13 +44,9 @@ load helpers
     run_podman rmi -f $fqin
 }
 
+# Integration tag to catch future breakage in tar, e.g. #19407
+# bats test_tags=distro-integration
 @test "podman export, alter tarball, re-import" {
-    # Skip this only when running under rawhide in CI, since detecting
-    # and/or skipping for rawhide outside this environment is unhelpful.
-    if [[ "$CIRRUS_CI" == "true" ]] && [[ "$DISTRO_NV" == "rawhide" ]]; then
-        skip "FIXME: #19407 Broken in rawhide: processing tar file(): duplicates of file paths not supported"
-    fi
-
     # Create a test file following test
     mkdir $PODMAN_TMPDIR/tmp
     touch $PODMAN_TMPDIR/testfile1

diff --git a/test/system/180-blkio.bats b/test/system/180-blkio.bats
@@ -24,9 +24,6 @@ function teardown() {
 }
 
 @test "podman run --blkio-weight-device" {
-    # Broken on rawhide & F38 images as of c20230726t191046z-f38f37d13
-    skip "FIXME: #19471 brq / blkio / loopbackfs / something broken"
-
     skip_if_rootless "cannot create devices in rootless mode"
 
     # create loopback device

diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
@@ -514,7 +514,6 @@ 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

diff --git a/test/system/280-update.bats b/test/system/280-update.bats
@@ -16,10 +16,8 @@ function teardown() {
 }
 
 
+# bats test_tags=distro-integration
 @test "podman update - test all options" {
-    # Broken on rawhide & F38 images as of c20230726t191046z-f38f37d13
-    skip "FIXME: #19471 brq / blkio / loopbackfs / something broken"
-
     local cgv=1
     if is_cgroupsv2; then
         cgv=2;