diff options
| author | Chris Evich <cevich@redhat.com> | 2021-11-09 11:55:14 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2021-11-18 13:50:11 -0500 |
| commit | 5bd43fbea7e79e3a9b6365263569c19ac39a9fe0 (patch) | |
| tree | 37f9429bced52959e5ad7ab674ce22b7ec098312 | |
| parent | f3021f3f6eff325236d9bdeccb9d7cc58bf1ce2d (diff) | |
| download | podman-5bd43fbea7e79e3a9b6365263569c19ac39a9fe0.tar.gz podman-5bd43fbea7e79e3a9b6365263569c19ac39a9fe0.tar.bz2 podman-5bd43fbea7e79e3a9b6365263569c19ac39a9fe0.zip | |
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>
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 90d28b7ac..80ecd89ce 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -171,6 +171,18 @@ case "$TEST_ENVIRON" in # affected/related tests are sensitive to this variable. warn "Disabling usernamespace integration testing" 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 ;; *) die_unknown TEST_ENVIRON |