Merge pull request #13697 from edsantiago/upgrade_test_matrix

Upgrade tests: reexamine cross-testing matrix
containers · Mar 30, 2022 · c08e8c3 · c08e8c3
2 parents 3c75c4a + 2a882b7
commit c08e8c3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -721,14 +721,12 @@ upgrade_test_task:
     depends_on:
       - local_system_test
     matrix:
-        - env:
-              PODMAN_UPGRADE_FROM: v1.9.0
-        - env:
-              PODMAN_UPGRADE_FROM: v2.0.6
         - env:
               PODMAN_UPGRADE_FROM: v2.1.1
         - env:
               PODMAN_UPGRADE_FROM: v3.1.2
+        - env:
+              PODMAN_UPGRADE_FROM: v3.4.4
     gce_instance: *standardvm
     env:
         TEST_FLAVOR: upgrade_test

diff --git 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"