containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24759 from Luap99/new-images 

Update VM images
This commit is contained in:
openshift-merge-bot[bot] 2024-12-13 14:17:10 +00:00 committed by GitHub
parent beefbd7560 e6d8603136
commit 8030093498
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 5 deletions
Show Stats 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: "c20241118t130000z-f41f40d13"
IMAGE_SUFFIX: "c20241212t122344z-f41f40d13"
# EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"

4
test/e2e/common_test.go
View File

@ -923,10 +923,10 @@ func SkipIfNotSystemd(manager, reason string) {
}
}
func SkipOnOSVersion(os, version string) {
func SkipOnOSVersion(os, version string, reason string) {
info := GetHostDistributionInfo()
if info.Distribution == os && info.Version == version {
Skip(fmt.Sprintf("Test doesn't work on %s %s", os, version))
Skip(fmt.Sprintf("[%s %s]: %s", os, version, reason))
}
}

2
test/e2e/run_userns_test.go
View File

@ -93,7 +93,6 @@ var _ = Describe("Podman UserNS support", func() {
It("podman uidmapping and gidmapping with an idmapped volume", func() {
SkipIfRunc(podmanTest, "Test not supported yet with runc (issue 17433, wontfix)")
SkipOnOSVersion("fedora", "36")
session := podmanTest.Podman([]string{"run", "--uidmap=0:1:500", "--gidmap=0:200:5000", "-v", "my-foo-volume:/foo:Z,idmap", "alpine", "stat", "-c", "#%u:%g#", "/foo"})
session.WaitWithDefaultTimeout()
if strings.Contains(session.ErrorToString(), "Operation not permitted") {
@ -108,7 +107,6 @@ var _ = Describe("Podman UserNS support", func() {
It("podman uidmapping and gidmapping with an idmapped volume on existing directory", func() {
SkipIfRunc(podmanTest, "Test not supported yet with runc (issue 17433, wontfix)")
SkipOnOSVersion("fedora", "36")
// The directory /mnt already exists in the image
session := podmanTest.Podman([]string{"run", "--uidmap=0:1:500", "--gidmap=0:200:5000", "-v", "my-foo-volume:/mnt:Z,idmap", "alpine", "stat", "-c", "#%u:%g#", "/mnt"})
session.WaitWithDefaultTimeout()