From f99abf2433717c20ac7251a11b905a5b3fdf1fa0 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 16 Feb 2023 12:34:06 -0500 Subject: [PATCH] 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) --- qa/distros/container-hosts/centos_8.stream_container_tools.yaml | 2 +- .../container-hosts/centos_8.stream_container_tools_crun.yaml | 2 +- qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml | 2 +- qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml | 2 +- qa/distros/podman/centos_8.stream_container_tools.yaml | 2 +- qa/distros/podman/rhel_8.6_container_tools_3.0.yaml | 2 +- qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qa/distros/container-hosts/centos_8.stream_container_tools.yaml b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml index 4a9578e60d4..4a76306f19d 100644 --- a/qa/distros/container-hosts/centos_8.stream_container_tools.yaml +++ b/qa/distros/container-hosts/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/container-hosts/centos_8.stream_container_tools_crun.yaml b/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml index e50003ca8af..b06e1c87d7c 100644 --- a/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml +++ b/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml @@ -10,7 +10,7 @@ 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 - sudo sed -i 's/runtime = "runc"/#runtime = "runc"/g' /usr/share/containers/containers.conf - sudo sed -i 's/#runtime = "crun"/runtime = "crun"/g' /usr/share/containers/containers.conf diff --git a/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml index b226053d9e6..361d8546e2b 100644 --- a/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml +++ b/qa/distros/container-hosts/rhel_8.6_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/container-hosts/rhel_8.6_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml index a5c0bbf3e9c..be94ed69e7d 100644 --- a/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml +++ b/qa/distros/container-hosts/rhel_8.6_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 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.6_container_tools_3.0.yaml b/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml index b226053d9e6..361d8546e2b 100644 --- a/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml +++ b/qa/distros/podman/rhel_8.6_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.6_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml index a5c0bbf3e9c..be94ed69e7d 100644 --- a/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml +++ b/qa/distros/podman/rhel_8.6_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 -- 2.39.5