Skip to content

Commit c457e50

Browse files
authored
Merge pull request #27581 from timcoding1988/chore/new_base_image_for_fedora_43
update fedora base image to 43 and related tests
2 parents 254403d + 811c818 commit c457e50

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ env:
2424
####
2525
#### Cache-image names to test with (double-quotes around names are critical)
2626
####
27-
FEDORA_NAME: "fedora-42"
27+
FEDORA_NAME: "fedora-43"
2828
FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64"
29-
PRIOR_FEDORA_NAME: "fedora-41"
29+
PRIOR_FEDORA_NAME: "fedora-42"
3030
RAWHIDE_NAME: "rawhide"
3131
DEBIAN_NAME: "debian-14"
3232

3333
# Image identifiers
34-
IMAGE_SUFFIX: "c20251120t131229z-f42f41d14"
34+
IMAGE_SUFFIX: "c20251211t152018z-f43f42d14"
3535

3636
# EC2 images
3737
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"

contrib/cirrus/runner.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@ if [ "$(type -t $handler)" != "function" ]; then
506506
die "Unknown/Unsupported \$TEST_FLAVOR=$TEST_FLAVOR"
507507
fi
508508

509+
# Unset NOTIFY_SOCKET based on: https://github.com/containers/podman/pull/27514#issuecomment-3529125596
510+
unset NOTIFY_SOCKET
511+
509512
showrun $handler
510513

511514
if [[ -n "$TRACER_PID" ]]; then

test/apiv2/python/rest_api/test_v2_0_0_image.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import json
22
import unittest
3-
from multiprocessing import Process
3+
import multiprocessing as mp
44

55
import requests
66
from dateutil.parser import parse
@@ -168,9 +168,12 @@ def do_search5():
168168
self.assertEqual(r.status_code, 400, f"#5: {r.text}")
169169

170170
i = 1
171+
# Need to explicitly set start method
172+
# # https://docs.python.org/dev/library/multiprocessing.html#contexts-and-start-methods
173+
mp.set_start_method('fork')
171174
for fn in [do_search1, do_search2, do_search3, do_search4, do_search5]:
172175
with self.subTest(i=i):
173-
search = Process(target=fn)
176+
search = mp.Process(target=fn)
174177
search.start()
175178
search.join(timeout=10)
176179
self.assertFalse(search.is_alive(), f"#{i} /images/search took too long")

test/system/161-volume-quotas.bats

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ function teardown() {
4040
skip_if_rootless "Quotas are only possible with root"
4141
skip_if_remote "Requires --root flag, not possible w/ remote"
4242

43+
OS_RELEASE_ID="${OS_RELEASE_ID:-$(source /etc/os-release; echo $ID)}"
44+
if [[ "$OS_RELEASE_ID" == "fedora" ]]; then
45+
skip "FIXME #27759: There is a selinux problem with this test"
46+
fi
47+
4348
# Minimum XFS filesystem size is 300mb
4449
loop=$PODMAN_TMPDIR/disk.img
4550
fallocate -l 300m ${loop}

0 commit comments

Comments
 (0)