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

Merge pull request #24227 from Luap99/ci-image-update

Browse Source 
cirrus: update CI images
This commit is contained in:
openshift-merge-bot[bot]
2024-10-10 17:25:39 +00:00
committed by GitHub
parent 569d005b34 4e3a03795d
commit d512e44147
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

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

2
test/e2e/checkpoint_test.go
View File

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

5
test/e2e/containers_conf_test.go
View File

@ -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() {

4
test/system/030-run.bats
View File

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