Cirrus: Bump VMs

Source: containers/automation_images#157 Reason: see if new Ubuntu images have fixed runc Fixes: containers#15025 Signed-off-by: Ed Santiago <[email protected]>
edsantiago · Jul 25, 2022 · 751fe63 · 751fe63
1 parent b70e2a4
commit 751fe63
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -32,8 +32,8 @@ env:
     UBUNTU_NAME: "ubuntu-2204"
 
     # Image identifiers
-    IMAGE_SUFFIX: "c6013173500215296"
-    FEDORA_AMI_ID: "ami-0f116746f31965e41"
+    IMAGE_SUFFIX: "c5495735033528320"
+    FEDORA_AMI_ID: "ami-0df5df528071f1052"
     # Complete image names
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     #PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
@@ -70,7 +70,6 @@ echo $rand        |   0 | $rand
 }
 
 @test "podman run - uidmapping has no /sys/kernel mounts" {
-    skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
     skip_if_rootless "cannot umount as rootless"
     skip_if_remote "TODO Fix this for remote case"
 
@@ -806,7 +805,6 @@ EOF
 
 # rhbz#1902979 : podman run fails to update /etc/hosts when --uidmap is provided
 @test "podman run update /etc/hosts" {
-    skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
     HOST=$(random_string 25)
     run_podman run --uidmap 0:10001:10002 --rm --hostname ${HOST} $IMAGE grep ${HOST} /etc/hosts
     is "${lines[0]}" ".*${HOST}.*"

diff --git a/test/system/170-run-userns.bats b/test/system/170-run-userns.bats
@@ -30,15 +30,13 @@ function _require_crun() {
 }
 
 @test "podman --group-add without keep-groups while in a userns" {
-    skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
     skip_if_rootless "chroot is not allowed in rootless mode"
     skip_if_remote "--group-add keep-groups not supported in remote mode"
     run chroot --groups 1234,5678 / ${PODMAN} run --rm --uidmap 0:200000:5000 --group-add 457 $IMAGE id
     is "$output" ".*457" "Check group leaked into container"
 }
 
 @test "rootful pod with custom ID mapping" {
-    skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
     skip_if_rootless "does not work rootless - rootful feature"
     random_pod_name=$(random_string 30)
     run_podman pod create --uidmap 0:200000:5000 --name=$random_pod_name

diff --git a/test/system/400-unprivileged-access.bats b/test/system/400-unprivileged-access.bats
@@ -7,7 +7,6 @@
 load helpers
 
 @test "podman container storage is not accessible by unprivileged users" {
-    skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
     skip_if_rootless "test meaningless without suid"
     skip_if_remote
 

diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
@@ -84,7 +84,6 @@ load helpers
 
 # Issue #5466 - port-forwarding doesn't work with this option and -d
 @test "podman networking: port with --userns=keep-id for rootless or --uidmap=* for rootful" {
-    skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
     for cidr in "" "$(random_rfc1918_subnet).0/24"; do
         myport=$(random_free_port 52000-52999)
         if [[ -z $cidr ]]; then
@@ -745,7 +744,6 @@ EOF
 }
 
 @test "podman run /etc/* permissions" {
-    skip_if_cgroupsv1 "FIXME: #15025: run --uidmap fails on cgroups v1"
     userns="--userns=keep-id"
     if ! is_rootless; then
         userns="--uidmap=0:1111111:65536 --gidmap=0:1111111:65536"