From 413a0365aad9cffd90c0e5864bcd8bc27b7379a6 Mon Sep 17 00:00:00 2001 From: Tim Zhou Date: Fri, 21 Nov 2025 12:47:47 -0500 Subject: [PATCH 1/2] 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 3ede535a21f..f82f22bf51d 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: "c20251121t131714z-f43f42d14" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 9d67774da8c..fe2f6edf38d 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 e62b210ebc9..bd37d7a61fd 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 @@ def do_search5(): 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 599042dbf8a9ea766b0951b03f843c49158d8bfe Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 24 Nov 2025 09:16:09 +0100 Subject: [PATCH 2/2] wip Signed-off-by: Jan Kaluza --- contrib/cirrus/setup_environment.sh | 2 -- test/system/140-diff.bats | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index fe2f6edf38d..9d67774da8c 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 diff --git a/test/system/140-diff.bats b/test/system/140-diff.bats index ccb2a8c1bba..00ac9bb7532 100644 --- a/test/system/140-diff.bats +++ b/test/system/140-diff.bats @@ -38,10 +38,13 @@ load helpers } @test "podman diff with buildah container " { + + env + # Unset NOTIFY_SOCKET based on: https://github.com/containers/podman/pull/27514#issuecomment-3529125596 + unset NOTIFY_SOCKET rand_file=$(random_string 10) buildah from --name buildahctr $IMAGE buildah run buildahctr sh -c "touch /$rand_file;rm /etc/services" - run_podman diff --format json buildahctr # Expected results for each type of diff