diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-30 16:41:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 16:41:21 -0400 |
| commit | c08e8c30a1069acab69bd5704c6362c7c90252d6 (patch) | |
| tree | 0eab7690a0bb199f9982f33c3858e34aca6ae2cb | |
| parent | 3c75c4a54cba6a1949e53c4386447120b7ddb5a9 (diff) | |
| parent | 2a882b7703574dc890dd8e3a07be5ca9decd68ac (diff) | |
| download | podman-c08e8c30a1069acab69bd5704c6362c7c90252d6.tar.gz podman-c08e8c30a1069acab69bd5704c6362c7c90252d6.tar.bz2 podman-c08e8c30a1069acab69bd5704c6362c7c90252d6.zip | |
Merge pull request #13697 from edsantiago/upgrade_test_matrix
Upgrade tests: reexamine cross-testing matrix
| -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 8bf01bb50..beb871c23 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" |