Skip to content

Commit 7e3caae

Browse files
committed
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 <pholzing@redhat.com>
1 parent 5d79adb commit 7e3caae

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

contrib/cirrus/setup_environment.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ 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
7876
# This is a possible manual maintenance gaff, i.e. forgetting to update a
7977
# *_NAME variable in .cirrus.yml. check to be sure at least one comparison
8078
# matches the actual OS being run. Ignore details, such as debian point-release

0 commit comments

Comments
 (0)