Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
3 changes: 3 additions & 0 deletions contrib/cirrus/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,9 @@ dotest() {
die "The CI test TMPDIR is not on a tmpfs mount, we need tmpfs to make the tests faster"
fi

echo "----------"
printenv NOTIFY_SOCKET

showrun make ${localremote}${testsuite} PODMAN_SERVER_LOG=$PODMAN_SERVER_LOG EXTRA_BUILDTAGS="$TEST_BUILD_TAGS" \
|& logformatter

Expand Down
5 changes: 5 additions & 0 deletions contrib/cirrus/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ echo -e "\n# Begin single-use VM global variables (${BASH_SOURCE[0]})" \
done <<<"$(passthrough_envars)"
) >> "/etc/ci_environment"

echo "NOTIFY_SOCKET ---------"
printenv NOTIFY_SOCKET || true
echo "-------------"
# 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
Expand Down
7 changes: 5 additions & 2 deletions test/apiv2/python/rest_api/test_v2_0_0_image.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
import unittest
from multiprocessing import Process
import multiprocessing as mp

import requests
from dateutil.parser import parse
Expand Down Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions test/system/140-diff.bats
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ load helpers
}

@test "podman diff with buildah container " {
printenv NOTIFY_SOCKET

rand_file=$(random_string 10)

buildah from --name buildahctr $IMAGE
buildah run buildahctr sh -c "touch /$rand_file;rm /etc/services"

Expand Down
2 changes: 2 additions & 0 deletions test/system/161-volume-quotas.bats
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ function teardown() {
# make the function aware of the custom --root.
_PODMAN_TEST_OPTS="$safe_opts --storage-driver $(podman_storage_driver)" _prefetch $IMAGE

ls -lZ --recursive ${PODMAN_TMPDIR}/root

ctrname="testctr"
# pull never to ensure the prefetch works correctly
run_podman $safe_opts run -d --pull=never --name=$ctrname -i -v $vol_one:/one -v $vol_two:/two $IMAGE top
Expand Down
2 changes: 2 additions & 0 deletions test/system/setup_suite.bash
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ function setup_suite() {
IFS="
"

printenv NOTIFY_SOCKET >&3

# These are set/generated even for non-remote tests because some local tests still create their
# own system service.
export REMOTESYSTEM_UNIX_SOCK=$(mktemp ${BATS_SUITE_TMPDIR}/remotesystem.podman.XXXXXX.sock)
Expand Down