From: Adam King Date: Thu, 16 Feb 2023 17:34:06 +0000 (-0500) Subject: qa/distros: pass --allowerasing --nobest when installing container-tools X-Git-Tag: v16.2.13~89^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=773bf37a0dd28ab47c77b35db03b49e9806cd4b1;p=ceph.git qa/distros: pass --allowerasing --nobest when installing container-tools One of the tests in the orch suite is running distro install commands from multiple distros, causing it to first install container-tools 3.0 and then later install container-tools, which fails, causing the test to fail. This is sort of a bandaid fix to getthe test to work. It will cause whatever the last version of the package to be installed to end up being installed (and will do so without error) which is what we want in the tests. Fixes: https://tracker.ceph.com/issues/57771 Signed-off-by: Adam King (cherry picked from commit 3011d954986e38ae8f7c9cd027ef2a88dff9a3d8) Conflicts: qa/distros/container-hosts/centos_8.stream_container_tools.yaml qa/distros/container-hosts/centos_8.stream_container_tools.yaml~3011d954986 (qa_distros: pass --allowerasing --nobest when installing container-tools) qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml qa/distros/podman/rhel_8.6_container_tools_3.0.yaml --- diff --git a/qa/distros/podman/centos_8.stream_container_tools.yaml b/qa/distros/podman/centos_8.stream_container_tools.yaml index 4a9578e60d4..4a76306f19d 100644 --- a/qa/distros/podman/centos_8.stream_container_tools.yaml +++ b/qa/distros/podman/centos_8.stream_container_tools.yaml @@ -10,5 +10,5 @@ tasks: all: - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - sudo dnf -y module reset container-tools - - sudo dnf -y module install container-tools + - sudo dnf -y module install container-tools --allowerasing --nobest - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/podman/rhel_8.4_container_tools_3.0.yaml b/qa/distros/podman/rhel_8.4_container_tools_3.0.yaml index a01eec95228..01b1ad51ebb 100644 --- a/qa/distros/podman/rhel_8.4_container_tools_3.0.yaml +++ b/qa/distros/podman/rhel_8.4_container_tools_3.0.yaml @@ -9,5 +9,5 @@ tasks: all: - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - sudo dnf -y module reset container-tools - - sudo dnf -y module install container-tools:3.0 + - sudo dnf -y module install container-tools:3.0 --allowerasing --nobest - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml index fdce9e83749..741868eb4f6 100644 --- a/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml +++ b/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml @@ -9,5 +9,5 @@ tasks: all: - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - sudo dnf -y module reset container-tools - - sudo dnf -y module install container-tools:rhel8 + - sudo dnf -y module install container-tools:rhel8 --allowerasing --nobest - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf