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

cirrus: update CI images #24227

Merged
merged 3 commits into from
Oct 10, 2024
Merged

cirrus: update CI images #24227

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
a79fec5
cirrus: update CI images
Luap99 Oct 10, 2024
fe40495
test: update timezone checks
Luap99 Oct 10, 2024
4e3a037
test/e2e: skip some Containerized checkpoint tests
Luap99 Oct 10, 2024
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
View file
Open in desktop
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: "c20240911t151000z-f40f39d13"
IMAGE_SUFFIX: "c20241010t105554z-f40f39d13"

# EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/checkpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,7 @@ var _ = Describe("Podman checkpoint", func() {
})

It("podman checkpoint container with --pre-checkpoint", func() {
SkipIfContainerized("FIXME: #24230 - no longer works in container testing")
if !criu.MemTrack() {
Skip("system (architecture/kernel/CRIU) does not support memory tracking")
}
Expand Down Expand Up @@ -999,6 +1000,7 @@ var _ = Describe("Podman checkpoint", func() {
})

It("podman checkpoint container with --pre-checkpoint and export (migration)", func() {
SkipIfContainerized("FIXME: #24230 - no longer works in container testing")
SkipIfRemote("--import-previous is not yet supported on the remote client")
if !criu.MemTrack() {
Skip("system (architecture/kernel/CRIU) does not support memory tracking")
Expand Down
5 changes: 3 additions & 2 deletions test/e2e/containers_conf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,11 @@ var _ = Describe("Verify podman containers.conf usage", func() {
Expect(session.OutputToString()).To(ContainSubstring("HST"))

// verify flag still overrides
session = podmanTest.Podman([]string{"run", "--tz", "EST", ALPINE, "date", "+'%H %Z'"})
// Arizona does not observe DST so this command is safe at all times of the year
session = podmanTest.Podman([]string{"run", "--tz", "America/Phoenix", ALPINE, "date", "+'%H %Z'"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
Expect(session.OutputToString()).To(ContainSubstring("EST"))
Expect(session.OutputToString()).To(ContainSubstring("MST"))
})

It("add umask", func() {
Expand Down
4 changes: 2 additions & 2 deletions test/system/030-run.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,9 +518,9 @@ json-file | f
is "$output" "Sun Sep 13 12:26:40 UTC 2020" "podman run with no TZ"

# Multiple --tz options; confirm that the last one wins
run_podman run --rm --tz=US/Eastern --tz=Iceland --tz=MST7MDT \
run_podman run --rm --tz=US/Eastern --tz=Iceland --tz=America/New_York \
$IMAGE date -r $testfile
is "$output" "Sun Sep 13 06:26:40 MDT 2020" "podman run with --tz=MST7MDT"
is "$output" "Sun Sep 13 08:26:40 EDT 2020" "podman run with --tz=America/New_York"

# --tz=local pays attention to /etc/localtime, not $TZ. We set TZ anyway,
# to make sure podman ignores it; and, because this test is locale-
Expand Down