containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Workaround log_driver=journald setting 

In F35 the hard-coded default (from
containers-common-1-32.fc35.noarch) is 'journald' despite
the upstream repository having this line commented-out.
Containerized integration tests cannot run with 'journald'
as there is no daemon/process there to receive them.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2021-11-09 11:55:14 -05:00
parent f3021f3f6e
commit 5bd43fbea7
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/cirrus/setup_environment.sh
View File

@ -171,6 +171,18 @@ case "$TEST_ENVIRON" in
# affected/related tests are sensitive to this variable. # affected/related tests are sensitive to this variable.
warn "Disabling usernamespace integration testing" warn "Disabling usernamespace integration testing"
echo "SKIP_USERNS=1" >> /etc/ci_environment echo "SKIP_USERNS=1" >> /etc/ci_environment
# In F35 the hard-coded default
# (from containers-common-1-32.fc35.noarch) is 'journald' despite
# the upstream repository having this line commented-out.
# Containerized integration tests cannot run with 'journald'
# as there is no daemon/process there to receive them.
cconf="/usr/share/containers/containers.conf"
note="- commented-out by setup_environment.sh"
if grep -Eq '^log_driver.+journald' "$cconf"; then
warn "Patching out $cconf journald log_driver"
sed -r -i -e "s/^log_driver(.*)/# log_driver\1 $note/" "$cconf"
fi
fi fi
;; ;;
*) die_unknown TEST_ENVIRON *) die_unknown TEST_ENVIRON