opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20610 from edsantiago/bump_vm_images

Browse Source 
VM images: bump to 2023-11-16
This commit is contained in:
openshift-merge-bot[bot]
2023-11-17 10:53:51 +00:00
committed by GitHub
parent 857d610d04 d2a4ec867d
commit 5c97e12d5c
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.cirrus.yml
View File

@ -26,14 +26,14 @@ env:
#### ####
#### Cache-image names to test with (double-quotes around names are critical) #### Cache-image names to test with (double-quotes around names are critical)
#### ####
FEDORA_NAME: "fedora-39β" FEDORA_NAME: "fedora-39"
FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64"
PRIOR_FEDORA_NAME: "fedora-38" PRIOR_FEDORA_NAME: "fedora-38"
RAWHIDE_NAME: "rawhide" RAWHIDE_NAME: "rawhide"
DEBIAN_NAME: "debian-13" DEBIAN_NAME: "debian-13"
# Image identifiers # Image identifiers
IMAGE_SUFFIX: "c20231004t194547z-f39f38d13" IMAGE_SUFFIX: "c20231116t174419z-f39f38d13"
# EC2 images # EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"

8
test/e2e/run_test.go
View File

@ -1545,14 +1545,18 @@ VOLUME %s`, ALPINE, volPath, volPath)
container.WaitWithDefaultTimeout() container.WaitWithDefaultTimeout()
Expect(container).Should(Exit(0)) Expect(container).Should(Exit(0))
checkLines(container.OutputToStringArray()) checkLines(container.OutputToStringArray())
Expect(container.ErrorToString()).To(ContainSubstring("Running scope as unit: ")) Expect(container.ErrorToString()).To(Or(
ContainSubstring("Running scope as unit: "), // systemd < 255
ContainSubstring("Running as unit: "))) // systemd >= 255
// check that --cgroups=split is honored also when a container runs in a pod // check that --cgroups=split is honored also when a container runs in a pod
container = podmanTest.PodmanSystemdScope([]string{"run", "--rm", "--pod", "new:split-test-pod", "--cgroups=split", ALPINE, "cat", "/proc/self/cgroup"}) container = podmanTest.PodmanSystemdScope([]string{"run", "--rm", "--pod", "new:split-test-pod", "--cgroups=split", ALPINE, "cat", "/proc/self/cgroup"})
container.WaitWithDefaultTimeout() container.WaitWithDefaultTimeout()
Expect(container).Should(Exit(0)) Expect(container).Should(Exit(0))
checkLines(container.OutputToStringArray()) checkLines(container.OutputToStringArray())
Expect(container.ErrorToString()).To(ContainSubstring("Running scope as unit: ")) Expect(container.ErrorToString()).To(Or(
ContainSubstring("Running scope as unit: "), // systemd < 255
ContainSubstring("Running as unit: "))) // systemd >= 255
}) })
It("podman run with cgroups=disabled runs without cgroups", func() { It("podman run with cgroups=disabled runs without cgroups", func() {

5
test/system/005-info.bats
View File

@ -178,8 +178,13 @@ host.slirp4netns.executable | $expr_path
@test "CONTAINERS_CONF_OVERRIDE" { @test "CONTAINERS_CONF_OVERRIDE" {
skip_if_remote "remote does not support CONTAINERS_CONF*" skip_if_remote "remote does not support CONTAINERS_CONF*"
# Need to include runtime because it's runc in debian CI,
# and crun 1.11.1 barfs with "read from sync socket"
containersConf=$PODMAN_TMPDIR/containers.conf containersConf=$PODMAN_TMPDIR/containers.conf
cat >$containersConf <<EOF cat >$containersConf <<EOF
[engine]
runtime="$(podman_runtime)"
[containers] [containers]
env = [ "CONF1=conf1" ] env = [ "CONF1=conf1" ]

6
test/system/505-networking-pasta.bats
View File

@ -448,10 +448,6 @@ function teardown() {
} }
@test "Local forwarder, IPv4" { @test "Local forwarder, IPv4" {
if [[ "$CIRRUS_CI" == "true" ]] && [[ "$DISTRO_NV" == "debian-13" ]]; then
skip "FIXME: Needs passt 0.0~git20230625.32660ce-1 or later in debian SID, unavailable 8-2023."
fi
skip_if_no_ipv4 "IPv4 not routable on the host" skip_if_no_ipv4 "IPv4 not routable on the host"
run_podman run --dns 198.51.100.1 \ run_podman run --dns 198.51.100.1 \
@ -697,7 +693,7 @@ function teardown() {
} }
@test "TCP/IPv4 large transfer, tap" { @test "TCP/IPv4 large transfer, tap" {
skip "FIXME: #20170 - test hangs" skip "FIXME: #20170 - needs passt >= 2023-11-10"
pasta_test_do pasta_test_do
} }