Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ env:
DEBIAN_NAME: "debian-13"

# Image identifiers
IMAGE_SUFFIX: "c20250812t173301z-f42f41d13"
IMAGE_SUFFIX: "c20250910t092246z-f42f41d13"

# EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
Expand Down
4 changes: 3 additions & 1 deletion test/e2e/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,9 @@ var _ = Describe("Podman run", func() {
if st.IsDir() {
session = podmanTest.Podman([]string{"exec", "maskCtr", "ls", mask})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
// FIXME: crun 1.24 fails with EACCES https://github.com/containers/crun/issues/1876
// Thus ignore the exit status check here, we still check that the dir is empty with the output.
// Expect(session).Should(ExitCleanly())
Expect(session.OutputToString()).To(BeEmpty())
} else {
session = podmanTest.Podman([]string{"exec", "maskCtr", "cat", mask})
Expand Down
4 changes: 3 additions & 1 deletion test/system/030-run.bats
Original file line number Diff line number Diff line change
Expand Up @@ -1465,7 +1465,9 @@ EOF
# check if the underlying file system supports idmapped mounts
run_podman '?' run --security-opt label=disable --rm --uidmap=0:1000:10000 --rootfs $romount:idmap true
if [[ $status -ne 0 ]]; then
if [[ "$output" =~ "failed to create idmapped mount: invalid argument" ]]; then
# Note bash regex only works if the right hand side is unquoted so we have to use this extra var.
match="failed to create idmapped mount.* invalid argument"
if [[ "$output" =~ $match ]]; then
skip "idmapped mounts not supported"
fi
# Any other error is fatal
Expand Down
2 changes: 1 addition & 1 deletion test/system/060-mount.bats
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ EOF
mkdir $testmount
run mount -t tmpfs -o noswap none $testmount
if [[ $status -ne 0 ]]; then
if [[ $output =~ "bad option" ]]; then
if [[ $output =~ "bad option" ]] || [[ "$output" =~ "Unknown parameter" ]]; then
skip "requires kernel with tmpfs + noswap support"
fi
die "Could not test for tmpfs + noswap support: $output"
Expand Down