Skip to content

Commit

Permalink
Merge pull request #23937 from edsantiago/test-crun-17
Browse files Browse the repository at this point in the history
New VMs: test crun 1.17
  • Loading branch information
openshift-merge-bot[bot] authored Sep 17, 2024
2 parents 4dfff40 + 8d119f0 commit 1e9464c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:
DEBIAN_NAME: "debian-13"

# Image identifiers
IMAGE_SUFFIX: "c20240906t153420z-f40f39d13"
IMAGE_SUFFIX: "c20240911t151000z-f40f39d13"

# EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
Expand Down
10 changes: 2 additions & 8 deletions test/e2e/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -742,9 +742,9 @@ USER bin`, BB)
It("podman run limits host test", func() {
SkipIfRemote("This can only be used for local tests")
info := GetHostDistributionInfo()
if info.Distribution == "debian" {
if info.Distribution == "debian" && isRootless() {
// "expected 1048576 to be >= 1073741816"
Skip("FIXME 2024-05-28 fails on debian, maybe because of systemd 256?")
Skip("FIXME 2024-09 still fails on debian rootless, reason unknown")
}

var l syscall.Rlimit
Expand Down Expand Up @@ -2221,12 +2221,6 @@ WORKDIR /madethis`, BB)
})

It("podman run --shm-size-systemd", func() {
// FIXME Failed to set RLIMIT_CORE: Operation not permitted
info := GetHostDistributionInfo()
if info.Distribution == "debian" {
Skip("FIXME 2024-05-28 fails on debian, maybe because of systemd 256?")
}

ctrName := "testShmSizeSystemd"
run := podmanTest.Podman([]string{"run", "--name", ctrName, "--shm-size-systemd", "10mb", "-d", SYSTEMD_IMAGE, "/sbin/init"})
run.WaitWithDefaultTimeout()
Expand Down
2 changes: 1 addition & 1 deletion test/system/120-load.bats
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ verify_iid_and_name() {
skip "impossible due to pitfalls in our SSH implementation"
fi

# FIXME: Broken on debian SID systemd 256 <= rc3
# FIXME: Broken on debian SID; still broken 2024-09-11
# See https://github.com/containers/podman/pull/23020#issuecomment-2179284640
OS_RELEASE_ID="${OS_RELEASE_ID:-$(source /etc/os-release; echo $ID)}"
if [[ "$OS_RELEASE_ID" == "debian" ]]; then
Expand Down

1 comment on commit 1e9464c

@packit-as-a-service
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podman-next COPR build failed. @containers/packit-build please check.

Please sign in to comment.