Merge pull request #13697 from edsantiago/upgrade_test_matrix

Upgrade tests: reexamine cross-testing matrix
This commit is contained in:
OpenShift Merge Robot
2022-03-30 16:41:21 -04:00
committed by GitHub
2 changed files with 12 additions and 4 deletions

View File

@@ -75,6 +75,16 @@ setup() {
cat >| $pmscript <<EOF
#!/bin/bash
#
# Argh! podman >= 3.4 something something namespace something, fails with
# Error: invalid config provided: cannot set hostname when running in the host UTS namespace: invalid configuration
#
# https://github.com/containers/podman/issues/11969#issuecomment-943386484
#
if grep -q utsns /etc/containers/containers.conf; then
sed -i -e '/^\utsns=/d' /etc/containers/containers.conf
fi
# events-backend=journald does not work inside a container
opts="--events-backend=file $_PODMAN_TEST_OPTS"