From 2a882b7703574dc890dd8e3a07be5ca9decd68ac Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Tue, 29 Mar 2022 10:18:02 -0600
Subject: Upgrade tests: reexamine cross-testing matrix

 - removed: v1.9.0, v2.0.6
 + added:   v3.4.0

(Cannot add v4 because there's no such image on quay. As soon
as one appears, we should add it.)

Add a workaround for a UTS namespace conflict new in v3.4

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 test/upgrade/test-upgrade.bats | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'test/upgrade')

diff --git a/test/upgrade/test-upgrade.bats b/test/upgrade/test-upgrade.bats
index 063f4d624..198d8a169 100644
--- a/test/upgrade/test-upgrade.bats
+++ b/test/upgrade/test-upgrade.bats
@@ -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"
 
-- 
cgit v1.2.3-54-g00ecf