Skip to content

Commit 413a036

Browse files
author
Tim Zhou
committed
update fedoral base image to 43 and related tests
Signed-off-by: Tim Zhou <[email protected]>
1 parent 25c358e commit 413a036

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-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: "c20251121t131714z-f43f42d14"
3535

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

contrib/cirrus/setup_environment.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ echo -e "\n# Begin single-use VM global variables (${BASH_SOURCE[0]})" \
7373
done <<<"$(passthrough_envars)"
7474
) >> "/etc/ci_environment"
7575

76+
# Unset NOTIFY_SOCKET based on: https://github.com/containers/podman/pull/27514#issuecomment-3529125596
77+
unset NOTIFY_SOCKET
7678
# This is a possible manual maintenance gaff, i.e. forgetting to update a
7779
# *_NAME variable in .cirrus.yml. check to be sure at least one comparison
7880
# matches the actual OS being run. Ignore details, such as debian point-release

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

0 commit comments

Comments
 (0)