Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VM images: bump to 2023-11-16 #20610

Merged
merged 3 commits into from
Nov 17, 2023
Merged

VM images: bump to 2023-11-16 #20610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d711c3f
VM images: bump to 2023-11-16
edsantiago Nov 6, 2023
23ead49
pasta tests: remove some skips
edsantiago Nov 16, 2023
d2a4ec8
Test fixes for debian
edsantiago Nov 16, 2023
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
4 changes: 2 additions & 2 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ env:
####
#### 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"
PRIOR_FEDORA_NAME: "fedora-38"
RAWHIDE_NAME: "rawhide"
DEBIAN_NAME: "debian-13"

# Image identifiers
IMAGE_SUFFIX: "c20231004t194547z-f39f38d13"
IMAGE_SUFFIX: "c20231116t174419z-f39f38d13"

# EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
Expand Down
8 changes: 6 additions & 2 deletions test/e2e/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,14 +1545,18 @@ VOLUME %s`, ALPINE, volPath, volPath)
container.WaitWithDefaultTimeout()
Expect(container).Should(Exit(0))
checkLines(container.OutputToStringArray())
Expect(container.ErrorToString()).To(ContainSubstring("Running scope as unit: "))
Copy link
Member Author

Choose a reason for hiding this comment

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

systemd/systemd@7693661

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
container = podmanTest.PodmanSystemdScope([]string{"run", "--rm", "--pod", "new:split-test-pod", "--cgroups=split", ALPINE, "cat", "/proc/self/cgroup"})
container.WaitWithDefaultTimeout()
Expect(container).Should(Exit(0))
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() {
Expand Down
5 changes: 5 additions & 0 deletions test/system/005-info.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,13 @@ host.slirp4netns.executable | $expr_path
@test "CONTAINERS_CONF_OVERRIDE" {
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
cat >$containersConf <<EOF
[engine]
runtime="$(podman_runtime)"
[containers]
env = [ "CONF1=conf1" ]
Expand Down
6 changes: 1 addition & 5 deletions test/system/505-networking-pasta.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,10 +448,6 @@ function teardown() {
}

@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"

run_podman run --dns 198.51.100.1 \
Expand Down Expand Up @@ -697,7 +693,7 @@ function teardown() {
}

@test "TCP/IPv4 large transfer, tap" {
skip "FIXME: #20170 - test hangs"
skip "FIXME: #20170 - needs passt >= 2023-11-10"
pasta_test_do
}

Expand Down