diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-03-29 10:18:02 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2022-03-29 15:24:36 -0600 |
| commit | 2a882b7703574dc890dd8e3a07be5ca9decd68ac (patch) | |
| tree | 28508ffc160c9369f7f4ec26655ff73339838162 | |
| parent | c319edaaf8013d8397c5847a761f53e68536635a (diff) | |
| download | podman-2a882b7703574dc890dd8e3a07be5ca9decd68ac.tar.gz podman-2a882b7703574dc890dd8e3a07be5ca9decd68ac.tar.bz2 podman-2a882b7703574dc890dd8e3a07be5ca9decd68ac.zip | |
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>
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | test/upgrade/test-upgrade.bats | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ae5463427..4001704c4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -722,13 +722,11 @@ upgrade_test_task: - 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 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" |