From 5d79adbd6a8f1612c51e81ca68ed9b5d32ff7e19 Mon Sep 17 00:00:00 2001 From: Tim Zhou Date: Fri, 21 Nov 2025 12:47:47 -0500 Subject: [PATCH 1/3] update fedoral base image to 43 and related tests Signed-off-by: Tim Zhou --- .cirrus.yml | 6 +++--- contrib/cirrus/setup_environment.sh | 2 ++ test/apiv2/python/rest_api/test_v2_0_0_image.py | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 752ce3aa68..8ad9622c38 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -24,14 +24,14 @@ env: #### #### Cache-image names to test with (double-quotes around names are critical) #### - FEDORA_NAME: "fedora-42" + FEDORA_NAME: "fedora-43" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" - PRIOR_FEDORA_NAME: "fedora-41" + PRIOR_FEDORA_NAME: "fedora-42" RAWHIDE_NAME: "rawhide" DEBIAN_NAME: "debian-14" # Image identifiers - IMAGE_SUFFIX: "c20251120t131229z-f42f41d14" + IMAGE_SUFFIX: "c20251211t152018z-f43f42d14" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 9d67774da8..fe2f6edf38 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -73,6 +73,8 @@ echo -e "\n# Begin single-use VM global variables (${BASH_SOURCE[0]})" \ done <<<"$(passthrough_envars)" ) >> "/etc/ci_environment" +# Unset NOTIFY_SOCKET based on: https://github.com/containers/podman/pull/27514#issuecomment-3529125596 +unset NOTIFY_SOCKET # This is a possible manual maintenance gaff, i.e. forgetting to update a # *_NAME variable in .cirrus.yml. check to be sure at least one comparison # matches the actual OS being run. Ignore details, such as debian point-release diff --git a/test/apiv2/python/rest_api/test_v2_0_0_image.py b/test/apiv2/python/rest_api/test_v2_0_0_image.py index e62b210ebc..bd37d7a61f 100644 --- a/test/apiv2/python/rest_api/test_v2_0_0_image.py +++ b/test/apiv2/python/rest_api/test_v2_0_0_image.py @@ -1,6 +1,6 @@ import json import unittest -from multiprocessing import Process +import multiprocessing as mp import requests from dateutil.parser import parse @@ -168,9 +168,12 @@ class ImageTestCase(APITestCase): self.assertEqual(r.status_code, 400, f"#5: {r.text}") i = 1 + # Need to explicitly set start method + # # https://docs.python.org/dev/library/multiprocessing.html#contexts-and-start-methods + mp.set_start_method('fork') for fn in [do_search1, do_search2, do_search3, do_search4, do_search5]: with self.subTest(i=i): - search = Process(target=fn) + search = mp.Process(target=fn) search.start() search.join(timeout=10) self.assertFalse(search.is_alive(), f"#{i} /images/search took too long") From 7e3caaed84fe1427b942f893975035145a71be15 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 12 Dec 2025 14:09:18 +0100 Subject: [PATCH 2/3] cirrus: ensure NOTIFY_SOCKET is properly unset for all tests Podman uses this env toi do various things, we don't want the external env to affect our tests here. Signed-off-by: Paul Holzinger --- contrib/cirrus/runner.sh | 3 +++ contrib/cirrus/setup_environment.sh | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 3aaa065e75..8816269613 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -506,6 +506,9 @@ if [ "$(type -t $handler)" != "function" ]; then die "Unknown/Unsupported \$TEST_FLAVOR=$TEST_FLAVOR" fi +# Unset NOTIFY_SOCKET based on: https://github.com/containers/podman/pull/27514#issuecomment-3529125596 +unset NOTIFY_SOCKET + showrun $handler if [[ -n "$TRACER_PID" ]]; then diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index fe2f6edf38..9d67774da8 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -73,8 +73,6 @@ echo -e "\n# Begin single-use VM global variables (${BASH_SOURCE[0]})" \ done <<<"$(passthrough_envars)" ) >> "/etc/ci_environment" -# Unset NOTIFY_SOCKET based on: https://github.com/containers/podman/pull/27514#issuecomment-3529125596 -unset NOTIFY_SOCKET # This is a possible manual maintenance gaff, i.e. forgetting to update a # *_NAME variable in .cirrus.yml. check to be sure at least one comparison # matches the actual OS being run. Ignore details, such as debian point-release From 811c818fc9ec03c5d8d1377326378d309cfe3726 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 12 Dec 2025 14:16:39 +0100 Subject: [PATCH 3/3] test/system: skip podman volumes with XFS quotas on fedora It fails due selinux, it is unlcear why so I filled #27759 for now to track that so we can get the image update merged. Signed-off-by: Paul Holzinger --- test/system/161-volume-quotas.bats | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/system/161-volume-quotas.bats b/test/system/161-volume-quotas.bats index fb49d21cd2..9d9273035d 100644 --- a/test/system/161-volume-quotas.bats +++ b/test/system/161-volume-quotas.bats @@ -40,6 +40,11 @@ function teardown() { skip_if_rootless "Quotas are only possible with root" skip_if_remote "Requires --root flag, not possible w/ remote" + OS_RELEASE_ID="${OS_RELEASE_ID:-$(source /etc/os-release; echo $ID)}" + if [[ "$OS_RELEASE_ID" == "fedora" ]]; then + skip "FIXME #27759: There is a selinux problem with this test" + fi + # Minimum XFS filesystem size is 300mb loop=$PODMAN_TMPDIR/disk.img fallocate -l 300m ${loop}